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/schema/ObjectClass.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/sdk/src/org/opends/sdk/schema/ObjectClass.java b/sdk/src/org/opends/sdk/schema/ObjectClass.java
index bc8f031..15b3940 100644
--- a/sdk/src/org/opends/sdk/schema/ObjectClass.java
+++ b/sdk/src/org/opends/sdk/schema/ObjectClass.java
@@ -34,7 +34,8 @@
import java.util.*;
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.LocalizableMessage;
+
import com.sun.opends.sdk.util.Validator;
@@ -591,7 +592,7 @@
@Override
- void validate(List<Message> warnings, Schema schema)
+ void validate(List<LocalizableMessage> warnings, Schema schema)
throws SchemaException
{
if (validated)
@@ -617,7 +618,7 @@
}
catch (final UnknownSchemaElementException e)
{
- final Message message =
+ final LocalizableMessage message =
WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_SUPERIOR_CLASS.get(
oid, superClassOid);
throw new SchemaException(message, e);
@@ -633,7 +634,7 @@
// classes.
if (superiorType != ObjectClassType.ABSTRACT)
{
- final Message message =
+ final LocalizableMessage message =
WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.get(
oid, objectClassType.toString(), superiorType
.toString(), superiorClass.getNameOrOID());
@@ -647,7 +648,7 @@
if (superiorType != ObjectClassType.ABSTRACT
&& superiorType != ObjectClassType.AUXILIARY)
{
- final Message message =
+ final LocalizableMessage message =
WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.get(
oid, objectClassType.toString(), superiorType
.toString(), superiorClass.getNameOrOID());
@@ -661,7 +662,7 @@
if (superiorType != ObjectClassType.ABSTRACT
&& superiorType != ObjectClassType.STRUCTURAL)
{
- final Message message =
+ final LocalizableMessage message =
WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.get(
oid, objectClassType.toString(), superiorType
.toString(), superiorClass.getNameOrOID());
@@ -717,7 +718,7 @@
// in the superior chain.
if (!derivesTop)
{
- final Message message =
+ final LocalizableMessage message =
WARN_ATTR_SYNTAX_OBJECTCLASS_STRUCTURAL_SUPERIOR_NOT_TOP
.get(oid);
throw new SchemaException(message);
@@ -755,7 +756,7 @@
// This isn't good because it means that the objectclass
// requires an attribute type that we don't know anything
// about.
- final Message message =
+ final LocalizableMessage message =
WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_REQUIRED_ATTR.get(
oid, requiredAttribute);
throw new SchemaException(message, e);
@@ -788,7 +789,7 @@
// This isn't good because it means that the objectclass
// requires an attribute type that we don't know anything
// about.
- final Message message =
+ final LocalizableMessage message =
WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_OPTIONAL_ATTR.get(
oid, optionalAttribute);
throw new SchemaException(message, e);
--
Gitblit v1.10.0