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/ASN1ByteSequenceReader.java | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/sdk/src/org/opends/sdk/asn1/ASN1ByteSequenceReader.java b/sdk/src/org/opends/sdk/asn1/ASN1ByteSequenceReader.java
index 2c21de6..e0dd0a6 100644
--- a/sdk/src/org/opends/sdk/asn1/ASN1ByteSequenceReader.java
+++ b/sdk/src/org/opends/sdk/asn1/ASN1ByteSequenceReader.java
@@ -36,12 +36,8 @@
import java.util.LinkedList;
import java.util.logging.Level;
-import org.opends.sdk.ByteSequenceReader;
-import org.opends.sdk.ByteString;
-import org.opends.sdk.ByteStringBuilder;
-import org.opends.sdk.DecodeException;
+import org.opends.sdk.*;
-import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;
@@ -155,7 +151,7 @@
// Read just the type.
if (reader.remaining() <= 0)
{
- Message message = ERR_ASN1_TRUCATED_TYPE_BYTE.get();
+ LocalizableMessage message = ERR_ASN1_TRUCATED_TYPE_BYTE.get();
throw DecodeException.fatalError(message);
}
int type = reader.get();
@@ -179,13 +175,13 @@
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);
}
if (reader.remaining() < peekLength)
{
- Message message = ERR_ASN1_BOOLEAN_TRUNCATED_VALUE
+ LocalizableMessage message = ERR_ASN1_BOOLEAN_TRUNCATED_VALUE
.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -205,7 +201,7 @@
{
if (readerStack.isEmpty())
{
- Message message = ERR_ASN1_SEQUENCE_READ_NOT_STARTED.get();
+ LocalizableMessage message = ERR_ASN1_SEQUENCE_READ_NOT_STARTED.get();
throw new IllegalStateException(message.toString());
}
@@ -246,7 +242,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);
}
@@ -267,13 +263,13 @@
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);
}
if (reader.remaining() < peekLength)
{
- Message message = ERR_ASN1_INTEGER_TRUNCATED_VALUE
+ LocalizableMessage message = ERR_ASN1_INTEGER_TRUNCATED_VALUE
.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -324,7 +320,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);
}
@@ -343,7 +339,7 @@
if (reader.remaining() < peekLength)
{
- Message message = ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE
+ LocalizableMessage message = ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE
.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -366,7 +362,7 @@
// Copy the value.
if (reader.remaining() < peekLength)
{
- Message message = ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE
+ LocalizableMessage message = ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE
.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -388,7 +384,7 @@
if (reader.remaining() < peekLength)
{
- Message message = ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE
+ LocalizableMessage message = ERR_ASN1_OCTET_STRING_TRUNCATED_VALUE
.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -409,7 +405,7 @@
if (reader.remaining() < peekLength)
{
- Message message = ERR_ASN1_SEQUENCE_SET_TRUNCATED_VALUE
+ LocalizableMessage message = ERR_ASN1_SEQUENCE_SET_TRUNCATED_VALUE
.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -447,7 +443,7 @@
if (reader.remaining() < peekLength)
{
- Message message = ERR_ASN1_SKIP_TRUNCATED_VALUE.get(peekLength);
+ LocalizableMessage message = ERR_ASN1_SKIP_TRUNCATED_VALUE.get(peekLength);
throw DecodeException.fatalError(message);
}
@@ -477,7 +473,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;
@@ -489,7 +485,7 @@
int 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);
}
@@ -499,7 +495,7 @@
{
if (throwEofException)
{
- Message message = ERR_ASN1_TRUNCATED_LENGTH_BYTES
+ LocalizableMessage message = ERR_ASN1_TRUNCATED_LENGTH_BYTES
.get(lengthBytesNeeded);
throw DecodeException.fatalError(message);
}
@@ -518,7 +514,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);
}
@@ -548,7 +544,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