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/RDN.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/sdk/src/org/opends/sdk/RDN.java b/sdk/src/org/opends/sdk/RDN.java
index 2f3cabb..c5b840a 100644
--- a/sdk/src/org/opends/sdk/RDN.java
+++ b/sdk/src/org/opends/sdk/RDN.java
@@ -376,7 +376,7 @@
}
catch (final UnknownSchemaElementException e)
{
- final Message message = ERR_RDN_TYPE_NOT_FOUND.get(rdn, e
+ final LocalizableMessage message = ERR_RDN_TYPE_NOT_FOUND.get(rdn, e
.getMessageObject());
throw new LocalizedIllegalArgumentException(message);
}
@@ -397,7 +397,7 @@
// that would be invalid.
if (reader.remaining() == 0)
{
- final Message message = ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME
.get(reader.getString(), attribute.getNameOrOID());
throw new LocalizedIllegalArgumentException(message);
}
@@ -407,7 +407,7 @@
char c;
if ((c = reader.read()) != '=')
{
- final Message message = ERR_ATTR_SYNTAX_DN_NO_EQUAL.get(reader
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_DN_NO_EQUAL.get(reader
.getString(), attribute.getNameOrOID(), c);
throw new LocalizedIllegalArgumentException(message);
}
@@ -444,7 +444,7 @@
{
if (lastWasPeriod)
{
- final Message message = ERR_ATTR_SYNTAX_OID_CONSECUTIVE_PERIODS
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_OID_CONSECUTIVE_PERIODS
.get(reader.getString(), reader.pos() - 1);
throw new LocalizedIllegalArgumentException(message);
}
@@ -456,7 +456,7 @@
else if (!isDigit(c))
{
// This must have been an illegal character.
- final Message message = ERR_ATTR_SYNTAX_OID_ILLEGAL_CHARACTER
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_OID_ILLEGAL_CHARACTER
.get(reader.getString(), reader.pos() - 1);
throw new LocalizedIllegalArgumentException(message);
}
@@ -477,7 +477,7 @@
if (length == 0 && !isAlpha(c))
{
// This is an illegal character.
- final Message message = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR
.get(reader.getString(), c, reader.pos() - 1);
throw new LocalizedIllegalArgumentException(message);
}
@@ -485,7 +485,7 @@
if (!isAlpha(c) && !isDigit(c) && c != '-')
{
// This is an illegal character.
- final Message message = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR
.get(reader.getString(), c, reader.pos() - 1);
throw new LocalizedIllegalArgumentException(message);
}
@@ -495,7 +495,7 @@
}
else
{
- final Message message = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(
reader.getString(), c, reader.pos() - 1);
throw new LocalizedIllegalArgumentException(message);
}
@@ -532,7 +532,7 @@
reader.mark();
if (reader.remaining() < 2)
{
- final Message message = ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT
.get(reader.getString());
throw new LocalizedIllegalArgumentException(message);
}
@@ -546,7 +546,7 @@
}
else
{
- final Message message = ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT
.get(reader.getString(), c);
throw new LocalizedIllegalArgumentException(message);
}
@@ -571,14 +571,14 @@
}
else
{
- final Message message = ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT
.get(reader.getString(), c);
throw new LocalizedIllegalArgumentException(message);
}
}
else
{
- final Message message = ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT
.get(reader.getString());
throw new LocalizedIllegalArgumentException(message);
}
@@ -590,7 +590,7 @@
}
else
{
- final Message message = ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT
.get(reader.getString(), c);
throw new LocalizedIllegalArgumentException(message);
}
@@ -607,7 +607,7 @@
}
catch (final Exception e)
{
- final Message message = ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE
.get(reader.getString(), String.valueOf(e));
throw new LocalizedIllegalArgumentException(message);
}
@@ -646,7 +646,7 @@
if (bytes.length() == 0)
{
// We don't allow an empty attribute value.
- final Message message = ERR_ATTR_SYNTAX_DN_INVALID_REQUIRES_ESCAPE_CHAR
+ final LocalizableMessage message = ERR_ATTR_SYNTAX_DN_INVALID_REQUIRES_ESCAPE_CHAR
.get(reader.getString(), reader.pos());
throw new LocalizedIllegalArgumentException(message);
}
--
Gitblit v1.10.0