From cfc513043c5830b5a967733066068c7097b42e3c Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java | 322 +++++++++++++++++++++++++++--------------------------
1 files changed, 164 insertions(+), 158 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
index 1793f94..87761fa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.schema;
+import org.opends.messages.Message;
@@ -55,8 +56,8 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
-import static org.opends.server.messages.MessageHandler.*;
-import static org.opends.server.messages.SchemaMessages.*;
+import static org.opends.messages.SchemaMessages.*;
+import org.opends.messages.MessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -112,30 +113,27 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- int msgID = MSGID_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE;
- String message = getMessage(msgID, EMR_CASE_IGNORE_OID,
- SYNTAX_OBJECTCLASS_NAME);
- throw new InitializationException(msgID, message);
+ Message message = ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ EMR_CASE_IGNORE_OID, SYNTAX_OBJECTCLASS_NAME);
+ throw new InitializationException(message);
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- int msgID = MSGID_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE;
- String message = getMessage(msgID, OMR_CASE_IGNORE_OID,
- SYNTAX_OBJECTCLASS_NAME);
- throw new InitializationException(msgID, message);
+ Message message = ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ OMR_CASE_IGNORE_OID, SYNTAX_OBJECTCLASS_NAME);
+ throw new InitializationException(message);
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- int msgID = MSGID_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE;
- String message = getMessage(msgID, SMR_CASE_IGNORE_OID,
- SYNTAX_OBJECTCLASS_NAME);
- throw new InitializationException(msgID, message);
+ Message message = ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ SMR_CASE_IGNORE_OID, SYNTAX_OBJECTCLASS_NAME);
+ throw new InitializationException(message);
}
}
@@ -216,7 +214,7 @@
* {@inheritDoc}
*/
public boolean valueIsAcceptable(ByteString value,
- StringBuilder invalidReason)
+ MessageBuilder invalidReason)
{
// We'll use the decodeObjectClass method to determine if the value is
// acceptable.
@@ -232,7 +230,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, de);
}
- invalidReason.append(de.getErrorMessage());
+ invalidReason.append(de.getMessageObject());
return false;
}
}
@@ -285,10 +283,9 @@
{
// This means that the value was empty or contained only whitespace. That
// is illegal.
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_EMPTY_VALUE;
- String message = getMessage(msgID);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_OBJECTCLASS_EMPTY_VALUE.get();
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -297,10 +294,10 @@
char c = valueStr.charAt(pos++);
if (c != '(')
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_OPEN_PARENTHESIS;
- String message = getMessage(msgID, valueStr, (pos-1), c);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_OPEN_PARENTHESIS.
+ get(valueStr, (pos-1), String.valueOf(c));
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -314,10 +311,10 @@
{
// This means that the end of the value was reached before we could find
// the OID. Ths is illegal.
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -337,11 +334,11 @@
{
if (lastWasPeriod)
{
- int msgID =
- MSGID_ATTR_SYNTAX_OBJECTCLASS_DOUBLE_PERIOD_IN_NUMERIC_OID;
- String message = getMessage(msgID, valueStr, (pos-1));
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_DOUBLE_PERIOD_IN_NUMERIC_OID.
+ get(valueStr, (pos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
else
{
@@ -351,10 +348,11 @@
else if (! isDigit(c))
{
// This must have been an illegal character.
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_NUMERIC_OID;
- String message = getMessage(msgID, valueStr, c, (pos-1));
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_NUMERIC_OID.
+ get(valueStr, String.valueOf(c), (pos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
else
{
@@ -376,10 +374,11 @@
else
{
// This must have been an illegal character.
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_STRING_OID;
- String message = getMessage(msgID, valueStr, c, (pos-1));
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_STRING_OID.
+ get(valueStr, String.valueOf(c), (pos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
}
}
@@ -390,10 +389,10 @@
String oid;
if (pos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
else
{
@@ -411,10 +410,10 @@
{
// This means that the end of the value was reached before we could find
// the OID. Ths is illegal.
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -449,11 +448,11 @@
// We must be at the end of the value. If not, then that's a problem.
if (pos < length)
{
- int msgID =
- MSGID_ATTR_SYNTAX_OBJECTCLASS_UNEXPECTED_CLOSE_PARENTHESIS;
- String message = getMessage(msgID, valueStr, (pos-1));
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_UNEXPECTED_CLOSE_PARENTHESIS.
+ get(valueStr, (pos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
break;
@@ -510,10 +509,10 @@
else
{
// This is an illegal character.
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR;
- String message = getMessage(msgID, valueStr, c, (pos-1));
+ Message message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(
+ valueStr, String.valueOf(c), (pos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
}
else if (lowerTokenName.equals("desc"))
@@ -548,11 +547,11 @@
{
// This is bad because we don't know what the superior objectclass
// is so we can't base this objectclass on it.
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_SUPERIOR_CLASS;
- String message = getMessage(msgID, String.valueOf(oid),
- String.valueOf(woidBuffer));
+ Message message =
+ WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_SUPERIOR_CLASS.
+ get(String.valueOf(oid), String.valueOf(woidBuffer));
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- message, msgID);
+ message);
}
}
@@ -611,10 +610,11 @@
{
// This isn't good because it means that the objectclass
// requires an attribute type that we don't know anything about.
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_REQUIRED_ATTR;
- String message = getMessage(msgID, oid, woidBuffer.toString());
+ Message message =
+ WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_REQUIRED_ATTR.
+ get(oid, woidBuffer.toString());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- message, msgID);
+ message);
}
}
@@ -631,10 +631,10 @@
}
else if (c != '$')
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR;
- String message = getMessage(msgID, valueStr, c, (pos-1));
+ Message message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(
+ valueStr, String.valueOf(c), (pos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
}
}
@@ -655,10 +655,11 @@
{
// This isn't good because it means that the objectclass requires
// an attribute type that we don't know anything about.
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_REQUIRED_ATTR;
- String message = getMessage(msgID, oid, woidBuffer.toString());
+ Message message =
+ WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_REQUIRED_ATTR.
+ get(oid, woidBuffer.toString());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- message, msgID);
+ message);
}
}
@@ -695,10 +696,11 @@
{
// This isn't good because it means that the objectclass allows
// an attribute type that we don't know anything about.
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_OPTIONAL_ATTR;
- String message = getMessage(msgID, oid, woidBuffer.toString());
+ Message message =
+ WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_OPTIONAL_ATTR.
+ get(oid, woidBuffer.toString());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- message, msgID);
+ message);
}
}
@@ -715,10 +717,10 @@
}
else if (c != '$')
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR;
- String message = getMessage(msgID, valueStr, c, (pos-1));
+ Message message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(
+ valueStr, String.valueOf(c), (pos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
}
}
@@ -739,10 +741,11 @@
{
// This isn't good because it means that the objectclass allows an
// attribute type that we don't know anything about.
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_OPTIONAL_ATTR;
- String message = getMessage(msgID, oid, woidBuffer.toString());
+ Message message =
+ WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_OPTIONAL_ATTR.
+ get(oid, woidBuffer.toString());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- message, msgID);
+ message);
}
}
@@ -779,12 +782,12 @@
// Abstract classes may only inherit from other abstract classes.
if (superiorType != ObjectClassType.ABSTRACT)
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE;
- String message = getMessage(msgID, oid, objectClassType.toString(),
- superiorType.toString(),
- superiorClass.getNameOrOID());
+ Message message =
+ WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.
+ get(oid, objectClassType.toString(), superiorType.toString(),
+ superiorClass.getNameOrOID());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- message, msgID);
+ message);
}
break;
@@ -794,12 +797,12 @@
if ((superiorType != ObjectClassType.ABSTRACT) &&
(superiorType != ObjectClassType.AUXILIARY))
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE;
- String message = getMessage(msgID, oid, objectClassType.toString(),
- superiorType.toString(),
- superiorClass.getNameOrOID());
+ Message message =
+ WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.
+ get(oid, objectClassType.toString(), superiorType.toString(),
+ superiorClass.getNameOrOID());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- message, msgID);
+ message);
}
break;
@@ -809,23 +812,23 @@
if ((superiorType != ObjectClassType.ABSTRACT) &&
(superiorType != ObjectClassType.STRUCTURAL))
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE;
- String message = getMessage(msgID, oid, objectClassType.toString(),
- superiorType.toString(),
- superiorClass.getNameOrOID());
+ Message message =
+ WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.
+ get(oid, objectClassType.toString(), superiorType.toString(),
+ superiorClass.getNameOrOID());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- message, msgID);
+ message);
}
// Structural classes must have the "top" objectclass somewhere in the
// superior chain.
if (! superiorChainIncludesTop(superiorClass))
{
- int msgID =
- MSGID_ATTR_SYNTAX_OBJECTCLASS_STRUCTURAL_SUPERIOR_NOT_TOP;
- String message = getMessage(msgID, oid);
+ Message message =
+ WARN_ATTR_SYNTAX_OBJECTCLASS_STRUCTURAL_SUPERIOR_NOT_TOP.
+ get(oid);
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- message, msgID);
+ message);
}
break;
}
@@ -870,10 +873,10 @@
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -929,20 +932,20 @@
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
// The next character must be a single quote.
if (c != '\'')
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_QUOTE_AT_POS;
- String message = getMessage(msgID, valueStr, startPos, c);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = WARN_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_QUOTE_AT_POS.get(
+ valueStr, startPos, String.valueOf(c));
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -966,10 +969,10 @@
// If we're at the end of the value, then that's illegal.
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -1016,20 +1019,20 @@
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE;
- String message = getMessage(msgID, lowerStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(lowerStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
// The next character must be a single quote.
if (c != '\'')
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_QUOTE_AT_POS;
- String message = getMessage(msgID, valueStr, startPos, c);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = WARN_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_QUOTE_AT_POS.get(
+ valueStr, startPos, String.valueOf(c));
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -1054,10 +1057,10 @@
// If we're at the end of the value, then that's illegal.
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE;
- String message = getMessage(msgID, lowerStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(lowerStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -1097,10 +1100,10 @@
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE;
- String message = getMessage(msgID, lowerStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(lowerStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -1117,11 +1120,11 @@
{
if (lastWasPeriod)
{
- int msgID =
- MSGID_ATTR_SYNTAX_OBJECTCLASS_DOUBLE_PERIOD_IN_NUMERIC_OID;
- String message = getMessage(msgID, lowerStr, (startPos-1));
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_DOUBLE_PERIOD_IN_NUMERIC_OID.
+ get(lowerStr, (startPos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
else
{
@@ -1143,10 +1146,11 @@
}
// This must have been an illegal character.
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_NUMERIC_OID;
- String message = getMessage(msgID, lowerStr, c, (startPos-1));
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_NUMERIC_OID.
+ get(lowerStr, String.valueOf(c), (startPos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
else
{
@@ -1180,19 +1184,21 @@
}
// This must have been an illegal character.
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_STRING_OID;
- String message = getMessage(msgID, lowerStr, c, (startPos-1));
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_STRING_OID.
+ get(lowerStr, String.valueOf(c), (startPos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
}
}
else
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR;
- String message = getMessage(msgID, lowerStr, c, startPos);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(
+ lowerStr, String.valueOf(c), startPos);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -1206,10 +1212,10 @@
// If we're at the end of the value, then that's illegal.
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE;
- String message = getMessage(msgID, lowerStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(lowerStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -1249,10 +1255,10 @@
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -1284,10 +1290,10 @@
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
@@ -1299,10 +1305,10 @@
else if (c == '(')
{
// This is an illegal character.
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR;
- String message = getMessage(msgID, valueStr, c, startPos);
+ Message message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(
+ valueStr, String.valueOf(c), startPos);
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
else
{
@@ -1333,10 +1339,10 @@
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
--
Gitblit v1.10.0