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/MatchingRuleUseSyntax.java | 251 ++++++++++++++++++++++++--------------------------
1 files changed, 120 insertions(+), 131 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
index e12647f..665bd17 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.schema;
+import org.opends.messages.Message;
@@ -53,8 +54,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.StaticUtils.*;
@@ -110,30 +111,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_MATCHING_RULE_USE_NAME);
- throw new InitializationException(msgID, message);
+ Message message = ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ EMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_USE_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_MATCHING_RULE_USE_NAME);
- throw new InitializationException(msgID, message);
+ Message message = ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ OMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_USE_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_MATCHING_RULE_USE_NAME);
- throw new InitializationException(msgID, message);
+ Message message = ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ SMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_USE_NAME);
+ throw new InitializationException(message);
}
}
@@ -214,7 +212,7 @@
* {@inheritDoc}
*/
public boolean valueIsAcceptable(ByteString value,
- StringBuilder invalidReason)
+ MessageBuilder invalidReason)
{
// We'll use the decodeMatchingRuleUse method to determine if the value is
// acceptable.
@@ -230,7 +228,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, de);
}
- invalidReason.append(de.getErrorMessage());
+ invalidReason.append(de.getMessageObject());
return false;
}
}
@@ -284,10 +282,9 @@
{
// This means that the value was empty or contained only whitespace. That
// is illegal.
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_EMPTY_VALUE;
- String message = getMessage(msgID);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_EMPTY_VALUE.get();
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -296,10 +293,10 @@
char c = valueStr.charAt(pos++);
if (c != '(')
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_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_MRUSE_EXPECTED_OPEN_PARENTHESIS.get(
+ valueStr, (pos-1), String.valueOf(c));
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -313,10 +310,9 @@
{
// This means that the end of the value was reached before we could find
// the OID. Ths is illegal.
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -336,10 +332,11 @@
{
if (lastWasPeriod)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_DOUBLE_PERIOD_IN_NUMERIC_OID;
- String message = getMessage(msgID, valueStr, (pos-1));
+ Message message =
+ ERR_ATTR_SYNTAX_MRUSE_DOUBLE_PERIOD_IN_NUMERIC_OID.
+ get(valueStr, (pos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
else
{
@@ -349,10 +346,10 @@
else if (! isDigit(c))
{
// This must have been an illegal character.
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR_IN_NUMERIC_OID;
- String message = getMessage(msgID, valueStr, c, (pos-1));
+ Message message = ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR_IN_NUMERIC_OID.
+ get(valueStr, String.valueOf(c), (pos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
else
{
@@ -374,10 +371,10 @@
else
{
// This must have been an illegal character.
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR_IN_STRING_OID;
- String message = getMessage(msgID, valueStr, c, (pos-1));
+ Message message = ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR_IN_STRING_OID.
+ get(valueStr, String.valueOf(c), (pos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
}
}
@@ -388,10 +385,9 @@
String oid;
if (pos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
else
{
@@ -405,10 +401,10 @@
{
// This is bad because the matching rule use is associated with a matching
// rule that we don't know anything about.
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_UNKNOWN_MATCHING_RULE;
- String message = getMessage(msgID, valueStr, oid);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_MRUSE_UNKNOWN_MATCHING_RULE.get(valueStr, oid);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -422,10 +418,9 @@
{
// This means that the end of the value was reached before we could find
// the OID. Ths is illegal.
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -454,10 +449,10 @@
// We must be at the end of the value. If not, then that's a problem.
if (pos < length)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_UNEXPECTED_CLOSE_PARENTHESIS;
- String message = getMessage(msgID, valueStr, (pos-1));
+ Message message = ERR_ATTR_SYNTAX_MRUSE_UNEXPECTED_CLOSE_PARENTHESIS.
+ get(valueStr, (pos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
break;
@@ -512,10 +507,11 @@
else
{
// This is an illegal character.
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR;
- String message = getMessage(msgID, valueStr, c, (pos-1));
+ Message message =
+ ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR.get(
+ valueStr, String.valueOf(c), (pos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
}
else if (lowerTokenName.equals("desc"))
@@ -561,10 +557,10 @@
}
else
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_UNKNOWN_ATTR;
- String message = getMessage(msgID, oid, woidBuffer.toString());
+ Message message = ERR_ATTR_SYNTAX_MRUSE_UNKNOWN_ATTR.get(
+ oid, woidBuffer.toString());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- message, msgID);
+ message);
}
}
@@ -581,10 +577,11 @@
}
else if (c != '$')
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR;
- String message = getMessage(msgID, valueStr, c, (pos-1));
+ Message message =
+ ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR.get(
+ valueStr, String.valueOf(c), (pos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
}
}
@@ -605,10 +602,10 @@
}
else
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_UNKNOWN_ATTR;
- String message = getMessage(msgID, oid, woidBuffer.toString());
+ Message message = ERR_ATTR_SYNTAX_MRUSE_UNKNOWN_ATTR.get(
+ oid, woidBuffer.toString());
throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
- message, msgID);
+ message);
}
}
@@ -633,10 +630,9 @@
// Make sure that the set of attributes was defined.
if (attributes == null)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_NO_ATTR;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_NO_ATTR.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -677,10 +673,9 @@
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -736,20 +731,19 @@
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_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_MRUSE_EXPECTED_QUOTE_AT_POS;
- String message = getMessage(msgID, valueStr, startPos, c);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_EXPECTED_QUOTE_AT_POS.get(
+ valueStr, startPos, String.valueOf(c));
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -773,10 +767,9 @@
// If we're at the end of the value, then that's illegal.
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -823,20 +816,19 @@
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE;
- String message = getMessage(msgID, lowerStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_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_MRUSE_EXPECTED_QUOTE_AT_POS;
- String message = getMessage(msgID, valueStr, startPos, c);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_EXPECTED_QUOTE_AT_POS.get(
+ valueStr, startPos, String.valueOf(c));
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -861,10 +853,9 @@
// If we're at the end of the value, then that's illegal.
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE;
- String message = getMessage(msgID, lowerStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE.get(lowerStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -904,10 +895,9 @@
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE;
- String message = getMessage(msgID, lowerStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE.get(lowerStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -924,10 +914,11 @@
{
if (lastWasPeriod)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_DOUBLE_PERIOD_IN_NUMERIC_OID;
- String message = getMessage(msgID, lowerStr, (startPos-1));
+ Message message =
+ ERR_ATTR_SYNTAX_MRUSE_DOUBLE_PERIOD_IN_NUMERIC_OID.
+ get(lowerStr, (startPos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
else
{
@@ -949,10 +940,10 @@
}
// This must have been an illegal character.
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR_IN_NUMERIC_OID;
- String message = getMessage(msgID, lowerStr, c, (startPos-1));
+ Message message = ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR_IN_NUMERIC_OID.
+ get(lowerStr, String.valueOf(c), (startPos-1));
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
else
{
@@ -986,19 +977,20 @@
}
// This must have been an illegal character.
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR_IN_STRING_OID;
- String message = getMessage(msgID, lowerStr, c, (startPos-1));
+ Message message = ERR_ATTR_SYNTAX_MRUSE_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_MRUSE_ILLEGAL_CHAR;
- String message = getMessage(msgID, lowerStr, c, startPos);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message =
+ ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR.get(
+ lowerStr, String.valueOf(c), startPos);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -1012,10 +1004,9 @@
// If we're at the end of the value, then that's illegal.
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE;
- String message = getMessage(msgID, lowerStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE.get(lowerStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -1055,10 +1046,9 @@
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
@@ -1090,10 +1080,9 @@
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE.get(valueStr);
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
@@ -1105,10 +1094,11 @@
else if (c == '(')
{
// This is an illegal character.
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR;
- String message = getMessage(msgID, valueStr, c, startPos);
+ Message message =
+ ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR.get(
+ valueStr, String.valueOf(c), startPos);
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message, msgID);
+ message);
}
else
{
@@ -1139,10 +1129,9 @@
if (startPos >= length)
{
- int msgID = MSGID_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE;
- String message = getMessage(msgID, valueStr);
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
- msgID);
+ Message message = ERR_ATTR_SYNTAX_MRUSE_TRUNCATED_VALUE.get(valueStr);
+ throw new DirectoryException(
+ ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
}
--
Gitblit v1.10.0