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/controls/ServerSideSortControl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sdk/src/org/opends/sdk/controls/ServerSideSortControl.java b/sdk/src/org/opends/sdk/controls/ServerSideSortControl.java
index 3ab3dc1..ddb314e 100644
--- a/sdk/src/org/opends/sdk/controls/ServerSideSortControl.java
+++ b/sdk/src/org/opends/sdk/controls/ServerSideSortControl.java
@@ -13,12 +13,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.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Validator;
@@ -353,7 +353,7 @@
{
if (value == null)
{
- Message message = INFO_SORTREQ_CONTROL_NO_VALUE.get();
+ LocalizableMessage message = INFO_SORTREQ_CONTROL_NO_VALUE.get();
throw DecodeException.error(message);
}
@@ -363,7 +363,7 @@
reader.readStartSequence();
if (!reader.hasNextElement())
{
- Message message = INFO_SORTREQ_CONTROL_NO_SORT_KEYS.get();
+ LocalizableMessage message = INFO_SORTREQ_CONTROL_NO_SORT_KEYS.get();
throw DecodeException.error(message);
}
@@ -396,7 +396,7 @@
}
catch (IOException e)
{
- Message message = INFO_SORTREQ_CONTROL_CANNOT_DECODE_VALUE
+ LocalizableMessage message = INFO_SORTREQ_CONTROL_CANNOT_DECODE_VALUE
.get(getExceptionMessage(e));
throw DecodeException.error(message, e);
}
@@ -428,7 +428,7 @@
{
if (value == null)
{
- Message message = INFO_SORTRES_CONTROL_NO_VALUE.get();
+ LocalizableMessage message = INFO_SORTRES_CONTROL_NO_VALUE.get();
throw DecodeException.error(message);
}
@@ -449,7 +449,7 @@
}
catch (IOException e)
{
- Message message = INFO_SORTRES_CONTROL_CANNOT_DECODE_VALUE
+ LocalizableMessage message = INFO_SORTRES_CONTROL_CANNOT_DECODE_VALUE
.get(getExceptionMessage(e));
throw DecodeException.error(message, e);
}
@@ -519,7 +519,7 @@
{
if (token.length() == 0)
{
- Message message = INFO_SORTREQ_CONTROL_NO_ATTR_NAME
+ LocalizableMessage message = INFO_SORTREQ_CONTROL_NO_ATTR_NAME
.get(sortOrderString);
throw DecodeException.error(message);
}
@@ -528,13 +528,13 @@
}
else if (colonPos == 0)
{
- Message message = INFO_SORTREQ_CONTROL_NO_ATTR_NAME
+ LocalizableMessage message = INFO_SORTREQ_CONTROL_NO_ATTR_NAME
.get(sortOrderString);
throw DecodeException.error(message);
}
else if (colonPos == (token.length() - 1))
{
- Message message = INFO_SORTREQ_CONTROL_NO_MATCHING_RULE
+ LocalizableMessage message = INFO_SORTREQ_CONTROL_NO_MATCHING_RULE
.get(sortOrderString);
throw DecodeException.error(message);
}
--
Gitblit v1.10.0