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/TeletexTerminalIdentifierSyntax.java | 66 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
index 37a1c89..652a15b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
@@ -39,12 +39,12 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ByteString;
-import org.opends.server.types.ErrorLogCategory;
-import org.opends.server.types.ErrorLogSeverity;
+
+
import static org.opends.server.loggers.ErrorLogger.*;
-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.*;
@@ -120,27 +120,24 @@
DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
if (defaultEqualityMatchingRule == null)
{
- logError(ErrorLogCategory.SCHEMA, ErrorLogSeverity.SEVERE_ERROR,
- MSGID_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
- EMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME);
+ logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ EMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME));
}
defaultOrderingMatchingRule =
DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
if (defaultOrderingMatchingRule == null)
{
- logError(ErrorLogCategory.SCHEMA, ErrorLogSeverity.SEVERE_ERROR,
- MSGID_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
- OMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME);
+ logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ OMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME));
}
defaultSubstringMatchingRule =
DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
if (defaultSubstringMatchingRule == null)
{
- logError(ErrorLogCategory.SCHEMA, ErrorLogSeverity.SEVERE_ERROR,
- MSGID_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
- SMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME);
+ logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ SMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME));
}
}
@@ -256,7 +253,7 @@
* this syntax, or <CODE>false</CODE> if not.
*/
public boolean valueIsAcceptable(ByteString value,
- StringBuilder invalidReason)
+ MessageBuilder invalidReason)
{
// Get a lowercase string representation of the value and find its length.
String valueString = value.stringValue();
@@ -266,8 +263,8 @@
// The value must contain at least one character.
if (valueLength == 0)
{
- int msgID = MSGID_ATTR_SYNTAX_TELETEXID_EMPTY;
- invalidReason.append(getMessage(msgID));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_EMPTY.get());
return false;
}
@@ -276,8 +273,9 @@
char c = valueString.charAt(0);
if (! PrintableString.isPrintableCharacter(c))
{
- int msgID = MSGID_ATTR_SYNTAX_TELETEXID_NOT_PRINTABLE;
- invalidReason.append(getMessage(msgID, valueString, c, 0));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_NOT_PRINTABLE.get(
+ valueString, String.valueOf(c), 0));
return false;
}
@@ -297,8 +295,9 @@
{
if (! PrintableString.isPrintableCharacter(c))
{
- int msgID = MSGID_ATTR_SYNTAX_TELETEXID_NOT_PRINTABLE;
- invalidReason.append(getMessage(msgID, valueString, c, pos));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_NOT_PRINTABLE.get(
+ valueString, String.valueOf(c), pos));
}
}
}
@@ -309,8 +308,9 @@
// character was a dollar sign.
if (c == '$')
{
- int msgID = MSGID_ATTR_SYNTAX_TELETEXID_END_WITH_DOLLAR;
- invalidReason.append(getMessage(msgID, valueString));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_END_WITH_DOLLAR.get(
+ valueString));
return false;
}
else
@@ -346,17 +346,18 @@
int colonPos = paramStr.indexOf(':');
if (colonPos < 0)
{
- int msgID = MSGID_ATTR_SYNTAX_TELETEXID_PARAM_NO_COLON;
- invalidReason.append(getMessage(msgID, valueString, paramStr,
- paramStartPos));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_PARAM_NO_COLON.get(
+ valueString));
return false;
}
String paramName = paramStr.substring(0, colonPos);
if (! ALLOWED_TTX_PARAMETERS.contains(paramName))
{
- int msgID = MSGID_ATTR_SYNTAX_TELETEXID_ILLEGAL_PARAMETER;
- invalidReason.append(getMessage(msgID, valueString, paramName));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_ILLEGAL_PARAMETER.get(
+ valueString, paramName));
return false;
}
@@ -371,17 +372,18 @@
int colonPos = paramStr.indexOf(':');
if (colonPos < 0)
{
- int msgID = MSGID_ATTR_SYNTAX_TELETEXID_PARAM_NO_COLON;
- invalidReason.append(getMessage(msgID, valueString, paramStr,
- paramStartPos));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_PARAM_NO_COLON.get(
+ valueString));
return false;
}
String paramName = paramStr.substring(0, colonPos);
if (! ALLOWED_TTX_PARAMETERS.contains(paramName))
{
- int msgID = MSGID_ATTR_SYNTAX_TELETEXID_ILLEGAL_PARAMETER;
- invalidReason.append(getMessage(msgID, valueString, paramName));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_ILLEGAL_PARAMETER.get(
+ valueString, paramName));
return false;
}
--
Gitblit v1.10.0