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/com/sun/opends/sdk/util/StaticUtils.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/sdk/src/com/sun/opends/sdk/util/StaticUtils.java b/sdk/src/com/sun/opends/sdk/util/StaticUtils.java
index eff368a..8cdd478 100644
--- a/sdk/src/com/sun/opends/sdk/util/StaticUtils.java
+++ b/sdk/src/com/sun/opends/sdk/util/StaticUtils.java
@@ -40,10 +40,7 @@
import java.util.zip.Deflater;
import java.util.zip.Inflater;
-import org.opends.sdk.ByteSequence;
-import org.opends.sdk.ByteString;
-import org.opends.sdk.ByteStringBuilder;
-import org.opends.sdk.DecodeException;
+import org.opends.sdk.*;
@@ -1001,7 +998,7 @@
* @return The human-readable message generated for the provided
* exception.
*/
- public static Message getExceptionMessage(Throwable t)
+ public static LocalizableMessage getExceptionMessage(Throwable t)
{
if (t instanceof LocalizableException)
{
@@ -1012,7 +1009,7 @@
{
final StackTraceElement[] stackElements = t.getStackTrace();
- final MessageBuilder message = new MessageBuilder();
+ final LocalizableMessageBuilder message = new LocalizableMessageBuilder();
message.append("NullPointerException(");
message.append(stackElements[0].getFileName());
message.append(":");
@@ -1067,7 +1064,7 @@
message.append(")");
- return Message.raw(message.toString());
+ return LocalizableMessage.raw(message.toString());
}
}
@@ -1095,7 +1092,7 @@
if (length % 2 == 1)
{
- final Message message = ERR_HEX_DECODE_INVALID_LENGTH
+ final LocalizableMessage message = ERR_HEX_DECODE_INVALID_LENGTH
.get(hexString);
throw new ParseException(message.toString(), 0);
}
@@ -1186,7 +1183,7 @@
b = (byte) 0xF0;
break;
default:
- final Message message = ERR_HEX_DECODE_INVALID_CHARACTER.get(
+ final LocalizableMessage message = ERR_HEX_DECODE_INVALID_CHARACTER.get(
new String(new char[] { c1, c2 }), c1);
throw new ParseException(message.toString(), 0);
}
@@ -1248,7 +1245,7 @@
b |= 0x0F;
break;
default:
- final Message message = ERR_HEX_DECODE_INVALID_CHARACTER.get(
+ final LocalizableMessage message = ERR_HEX_DECODE_INVALID_CHARACTER.get(
new String(new char[] { c1, c2 }), c1);
throw new ParseException(message.toString(), 0);
}
@@ -1837,7 +1834,7 @@
}
}
}
- final Message message = ERR_INVALID_ESCAPE_CHAR.get(reader
+ final LocalizableMessage message = ERR_INVALID_ESCAPE_CHAR.get(reader
.getString(), c1);
throw DecodeException.error(message);
}
@@ -1846,7 +1843,7 @@
// comprise the escaped value.
if (reader.remaining() == 0)
{
- final Message message = ERR_HEX_DECODE_INVALID_LENGTH.get(reader
+ final LocalizableMessage message = ERR_HEX_DECODE_INVALID_LENGTH.get(reader
.getString());
throw DecodeException.error(message);
@@ -1910,7 +1907,7 @@
b |= 0x0F;
break;
default:
- final Message message = ERR_HEX_DECODE_INVALID_CHARACTER.get(
+ final LocalizableMessage message = ERR_HEX_DECODE_INVALID_CHARACTER.get(
new String(new char[] { c1, c2 }), c1);
throw DecodeException.error(message);
}
--
Gitblit v1.10.0