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/MatchedValuesControl.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/sdk/src/org/opends/sdk/controls/MatchedValuesControl.java b/sdk/src/org/opends/sdk/controls/MatchedValuesControl.java
index 6bd04a0..432d3d4 100644
--- a/sdk/src/org/opends/sdk/controls/MatchedValuesControl.java
+++ b/sdk/src/org/opends/sdk/controls/MatchedValuesControl.java
@@ -44,8 +44,6 @@
import org.opends.sdk.ldap.LDAPUtils;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
-import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
@@ -79,7 +77,7 @@
public LocalizedIllegalArgumentException visitAndFilter(Filter p,
List<Filter> subFilters)
{
- Message message = ERR_MVFILTER_BAD_FILTER_AND.get(p.toString());
+ LocalizableMessage message = ERR_MVFILTER_BAD_FILTER_AND.get(p.toString());
return new LocalizedIllegalArgumentException(message);
}
@@ -92,7 +90,7 @@
{
if (dnAttributes)
{
- Message message = ERR_MVFILTER_BAD_FILTER_EXT.get(p.toString());
+ LocalizableMessage message = ERR_MVFILTER_BAD_FILTER_EXT.get(p.toString());
return new LocalizedIllegalArgumentException(message);
}
else
@@ -107,7 +105,7 @@
public LocalizedIllegalArgumentException visitNotFilter(Filter p,
Filter subFilter)
{
- Message message = ERR_MVFILTER_BAD_FILTER_NOT.get(p.toString());
+ LocalizableMessage message = ERR_MVFILTER_BAD_FILTER_NOT.get(p.toString());
return new LocalizedIllegalArgumentException(message);
}
@@ -117,7 +115,7 @@
public LocalizedIllegalArgumentException visitOrFilter(Filter p,
List<Filter> subFilters)
{
- Message message = ERR_MVFILTER_BAD_FILTER_OR.get(p.toString());
+ LocalizableMessage message = ERR_MVFILTER_BAD_FILTER_OR.get(p.toString());
return new LocalizedIllegalArgumentException(message);
}
@@ -127,7 +125,7 @@
public LocalizedIllegalArgumentException visitUnrecognizedFilter(
Filter p, byte filterTag, ByteSequence filterBytes)
{
- Message message = ERR_MVFILTER_BAD_FILTER_UNRECOGNIZED.get(p
+ LocalizableMessage message = ERR_MVFILTER_BAD_FILTER_UNRECOGNIZED.get(p
.toString(), filterTag);
return new LocalizedIllegalArgumentException(message);
}
@@ -149,7 +147,7 @@
{
if (value == null)
{
- Message message = ERR_MATCHEDVALUES_NO_CONTROL_VALUE.get();
+ LocalizableMessage message = ERR_MATCHEDVALUES_NO_CONTROL_VALUE.get();
throw DecodeException.error(message);
}
@@ -159,7 +157,7 @@
reader.readStartSequence();
if (!reader.hasNextElement())
{
- Message message = ERR_MATCHEDVALUES_NO_FILTERS.get();
+ LocalizableMessage message = ERR_MATCHEDVALUES_NO_FILTERS.get();
throw DecodeException.error(message);
}
@@ -191,7 +189,7 @@
StaticUtils.DEBUG_LOG.throwing("MatchedValuesControl.Decoder",
"decode", e);
- Message message = ERR_MATCHEDVALUES_CANNOT_DECODE_VALUE_AS_SEQUENCE
+ LocalizableMessage message = ERR_MATCHEDVALUES_CANNOT_DECODE_VALUE_AS_SEQUENCE
.get(getExceptionMessage(e));
throw DecodeException.error(message);
}
--
Gitblit v1.10.0