From 1b9f39db0f5450de6c3bb97cec681c342fff5944 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Tue, 08 Dec 2009 10:52:42 +0000
Subject: [PATCH] Move Message/MessageBuilder/LocalizableException/LocalizableIllegalArgumentException to public API since other public API elements reference them. Prefix Message/MessageBuilder with Localizable to emphasize that these classes are I18N related and not protocol messages. Keep MessageDescriptor private since users should not need access to it for now.
---
sdk/src/org/opends/sdk/AttributeDescription.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sdk/src/org/opends/sdk/AttributeDescription.java b/sdk/src/org/opends/sdk/AttributeDescription.java
index af75c39..d02fe25 100644
--- a/sdk/src/org/opends/sdk/AttributeDescription.java
+++ b/sdk/src/org/opends/sdk/AttributeDescription.java
@@ -905,7 +905,7 @@
c = attributeDescription.charAt(i);
if (c != ' ')
{
- final Message message = ERR_ATTRIBUTE_DESCRIPTION_INTERNAL_WHITESPACE
+ final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_INTERNAL_WHITESPACE
.get(attributeDescription);
throw new LocalizedIllegalArgumentException(message);
}
@@ -940,7 +940,7 @@
// contained whitespace.
if (i == length)
{
- final Message message = ERR_ATTRIBUTE_DESCRIPTION_EMPTY
+ final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_EMPTY
.get(attributeDescription);
throw new LocalizedIllegalArgumentException(message);
}
@@ -949,7 +949,7 @@
ASCIICharProp cp = ASCIICharProp.valueOf(c);
if (cp == null)
{
- final Message message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
+ final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
.get(attributeDescription, c, i);
throw new LocalizedIllegalArgumentException(message);
}
@@ -972,7 +972,7 @@
cp = ASCIICharProp.valueOf(c);
if (!cp.isKeyChar())
{
- final Message message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
+ final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
.get(attributeDescription, c, i);
throw new LocalizedIllegalArgumentException(message);
}
@@ -996,7 +996,7 @@
cp = ASCIICharProp.valueOf(c);
if (c != '.' && !cp.isDigit())
{
- final Message message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
+ final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
.get(attributeDescription, c, i);
throw new LocalizedIllegalArgumentException(message);
}
@@ -1007,7 +1007,7 @@
}
else
{
- final Message message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
+ final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
.get(attributeDescription, c, i);
throw new LocalizedIllegalArgumentException(message);
}
@@ -1034,7 +1034,7 @@
if (oid.length() == 0)
{
- final Message message = ERR_ATTRIBUTE_DESCRIPTION_NO_TYPE
+ final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_NO_TYPE
.get(attributeDescription);
throw new LocalizedIllegalArgumentException(message);
}
@@ -1047,7 +1047,7 @@
}
catch (final UnknownSchemaElementException e)
{
- final Message message = ERR_ATTRIBUTE_DESCRIPTION_TYPE_NOT_FOUND
+ final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_TYPE_NOT_FOUND
.get(attributeDescription, e.getMessageObject());
throw new LocalizedIllegalArgumentException(message);
}
@@ -1085,7 +1085,7 @@
cp = ASCIICharProp.valueOf(c);
if (!cp.isKeyChar())
{
- final Message message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
+ final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
.get(attributeDescription, c, i);
throw new LocalizedIllegalArgumentException(message);
}
@@ -1120,7 +1120,7 @@
if (option.length() == 0)
{
- final Message message = ERR_ATTRIBUTE_DESCRIPTION_EMPTY_OPTION
+ final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_EMPTY_OPTION
.get(attributeDescription);
throw new LocalizedIllegalArgumentException(message);
}
@@ -1164,7 +1164,7 @@
cp = ASCIICharProp.valueOf(c);
if (!cp.isKeyChar())
{
- final Message message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
+ final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
.get(attributeDescription, c, i);
throw new LocalizedIllegalArgumentException(message);
}
@@ -1198,7 +1198,7 @@
if (option.length() == 0)
{
- final Message message = ERR_ATTRIBUTE_DESCRIPTION_EMPTY_OPTION
+ final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_EMPTY_OPTION
.get(attributeDescription);
throw new LocalizedIllegalArgumentException(message);
}
--
Gitblit v1.10.0