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/ldap/ASN1StreamReader.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sdk/src/org/opends/sdk/ldap/ASN1StreamReader.java b/sdk/src/org/opends/sdk/ldap/ASN1StreamReader.java
index 633d5df..77ea4fa 100644
--- a/sdk/src/org/opends/sdk/ldap/ASN1StreamReader.java
+++ b/sdk/src/org/opends/sdk/ldap/ASN1StreamReader.java
@@ -38,12 +38,12 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
+import org.opends.sdk.LocalizableMessage;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.AbstractASN1Reader;
import com.sun.grizzly.streams.StreamReader;
import com.sun.grizzly.utils.PoolableObject;
-import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;
@@ -141,7 +141,7 @@
public ChildSequenceLimiter endSequence() throws DecodeException
{
- Message message = ERR_ASN1_SEQUENCE_READ_NOT_STARTED.get();
+ LocalizableMessage message = ERR_ASN1_SEQUENCE_READ_NOT_STARTED.get();
throw new IllegalStateException(message.toString());
}
@@ -348,7 +348,7 @@
if (peekLength != 1)
{
- Message message = ERR_ASN1_BOOLEAN_INVALID_LENGTH.get(peekLength);
+ LocalizableMessage message = ERR_ASN1_BOOLEAN_INVALID_LENGTH.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -410,7 +410,7 @@
if ((peekLength < 1) || (peekLength > 4))
{
- Message message = ERR_ASN1_INTEGER_INVALID_LENGTH.get(peekLength);
+ LocalizableMessage message = ERR_ASN1_INTEGER_INVALID_LENGTH.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -431,7 +431,7 @@
if ((peekLength < 1) || (peekLength > 8))
{
- Message message = ERR_ASN1_INTEGER_INVALID_LENGTH.get(peekLength);
+ LocalizableMessage message = ERR_ASN1_INTEGER_INVALID_LENGTH.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -490,7 +490,7 @@
// Make sure that the decoded length is exactly zero byte.
if (peekLength != 0)
{
- Message message = ERR_ASN1_NULL_INVALID_LENGTH.get(peekLength);
+ LocalizableMessage message = ERR_ASN1_NULL_INVALID_LENGTH.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -736,7 +736,7 @@
// message size.
if ((maxElementSize > 0) && (peekLength > maxElementSize))
{
- Message m = ERR_LDAP_CLIENT_DECODE_MAX_REQUEST_SIZE_EXCEEDED.get(
+ LocalizableMessage m = ERR_LDAP_CLIENT_DECODE_MAX_REQUEST_SIZE_EXCEEDED.get(
peekLength, maxElementSize);
throw DecodeException.fatalError(m);
}
@@ -773,7 +773,7 @@
lengthBytesNeeded = peekLength;
if (lengthBytesNeeded > 4)
{
- Message message = ERR_ASN1_INVALID_NUM_LENGTH_BYTES
+ LocalizableMessage message = ERR_ASN1_INVALID_NUM_LENGTH_BYTES
.get(lengthBytesNeeded);
throw DecodeException.fatalError(message);
}
@@ -798,7 +798,7 @@
// message size.
if ((maxElementSize > 0) && (peekLength > maxElementSize))
{
- Message m = ERR_LDAP_CLIENT_DECODE_MAX_REQUEST_SIZE_EXCEEDED.get(
+ LocalizableMessage m = ERR_LDAP_CLIENT_DECODE_MAX_REQUEST_SIZE_EXCEEDED.get(
peekLength, maxElementSize);
throw DecodeException.fatalError(m);
}
--
Gitblit v1.10.0