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/asn1/ASN1InputStreamReader.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/sdk/src/org/opends/sdk/asn1/ASN1InputStreamReader.java b/sdk/src/org/opends/sdk/asn1/ASN1InputStreamReader.java
index 194e273..25e57a6 100644
--- a/sdk/src/org/opends/sdk/asn1/ASN1InputStreamReader.java
+++ b/sdk/src/org/opends/sdk/asn1/ASN1InputStreamReader.java
@@ -40,8 +40,8 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
+import org.opends.sdk.LocalizableMessage;
-import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.SizeLimitInputStream;
import com.sun.opends.sdk.util.StaticUtils;
@@ -197,14 +197,14 @@
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);
}
int readByte = in.read();
if (readByte == -1)
{
- Message message = ERR_ASN1_BOOLEAN_TRUNCATED_VALUE
+ LocalizableMessage message = ERR_ASN1_BOOLEAN_TRUNCATED_VALUE
.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -230,7 +230,7 @@
{
if (streamStack.isEmpty())
{
- Message message = ERR_ASN1_SEQUENCE_READ_NOT_STARTED.get();
+ LocalizableMessage message = ERR_ASN1_SEQUENCE_READ_NOT_STARTED.get();
throw new IllegalStateException(message.toString());
}
@@ -285,7 +285,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);
}
@@ -306,7 +306,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);
}
@@ -318,7 +318,7 @@
int readByte = in.read();
if (readByte == -1)
{
- Message message = ERR_ASN1_INTEGER_TRUNCATED_VALUE
+ LocalizableMessage message = ERR_ASN1_INTEGER_TRUNCATED_VALUE
.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -340,7 +340,7 @@
int readByte = in.read();
if (readByte == -1)
{
- Message message = ERR_ASN1_INTEGER_TRUNCATED_VALUE
+ LocalizableMessage message = ERR_ASN1_INTEGER_TRUNCATED_VALUE
.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -376,7 +376,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);
}
@@ -415,7 +415,7 @@
bytesRead = in.read(value, peekLength - bytesNeeded, bytesNeeded);
if (bytesRead < 0)
{
- Message message = ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE
+ LocalizableMessage message = ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE
.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -459,7 +459,7 @@
bytesRead = builder.append(in, bytesNeeded);
if (bytesRead < 0)
{
- Message message = ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE
+ LocalizableMessage message = ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE
.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -507,7 +507,7 @@
.read(buffer, peekLength - bytesNeeded, bytesNeeded);
if (bytesRead < 0)
{
- Message message = ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE
+ LocalizableMessage message = ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE
.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -595,7 +595,7 @@
long bytesSkipped = in.skip(peekLength);
if (bytesSkipped != peekLength)
{
- Message message = ERR_ASN1_SKIP_TRUNCATED_VALUE.get(peekLength);
+ LocalizableMessage message = ERR_ASN1_SKIP_TRUNCATED_VALUE.get(peekLength);
throw DecodeException.fatalError(message);
}
state = ELEMENT_READ_STATE_NEED_TYPE;
@@ -637,7 +637,7 @@
state = ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES;
if (throwEofException)
{
- Message message = ERR_ASN1_TRUNCATED_LENGTH_BYTES
+ LocalizableMessage message = ERR_ASN1_TRUNCATED_LENGTH_BYTES
.get(lengthBytesNeeded);
throw DecodeException.fatalError(message);
}
@@ -651,7 +651,7 @@
// message size.
if ((maxElementSize > 0) && (peekLength > maxElementSize))
{
- Message message = ERR_LDAP_CLIENT_DECODE_MAX_REQUEST_SIZE_EXCEEDED
+ LocalizableMessage message = ERR_LDAP_CLIENT_DECODE_MAX_REQUEST_SIZE_EXCEEDED
.get(peekLength, maxElementSize);
throw DecodeException.fatalError(message);
}
@@ -689,7 +689,7 @@
{
if (throwEofException)
{
- Message message = ERR_ASN1_TRUNCATED_LENGTH_BYTE.get();
+ LocalizableMessage message = ERR_ASN1_TRUNCATED_LENGTH_BYTE.get();
throw DecodeException.fatalError(message);
}
return false;
@@ -700,7 +700,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);
}
@@ -720,7 +720,7 @@
state = ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES;
if (throwEofException)
{
- Message message = ERR_ASN1_TRUNCATED_LENGTH_BYTES
+ LocalizableMessage message = ERR_ASN1_TRUNCATED_LENGTH_BYTES
.get(lengthBytesNeeded);
throw DecodeException.fatalError(message);
}
@@ -735,7 +735,7 @@
// message size.
if ((maxElementSize > 0) && (peekLength > maxElementSize))
{
- Message message = ERR_LDAP_CLIENT_DECODE_MAX_REQUEST_SIZE_EXCEEDED
+ LocalizableMessage message = ERR_LDAP_CLIENT_DECODE_MAX_REQUEST_SIZE_EXCEEDED
.get(peekLength, maxElementSize);
throw DecodeException.fatalError(message);
}
@@ -774,7 +774,7 @@
{
if (throwEofException)
{
- Message message = ERR_ASN1_TRUCATED_TYPE_BYTE.get();
+ LocalizableMessage message = ERR_ASN1_TRUCATED_TYPE_BYTE.get();
throw DecodeException.fatalError(message);
}
return false;
--
Gitblit v1.10.0