From 80c58327faaa4873369f6bb949e62792c2f708e0 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.
---
opends/src/server/org/opends/server/schema/TelexNumberSyntax.java | 68 +++++++++++++++++----------------
1 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java b/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java
index 2d1578a..74a2212 100644
--- a/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java
+++ b/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java
@@ -37,16 +37,15 @@
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.*;
-
/**
* This class implements the telex number attribute syntax, which contains three
* printable strings separated by dollar sign characters. Equality, ordering,
@@ -89,27 +88,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_TELEX_NAME);
+ logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+ EMR_CASE_IGNORE_OID, SYNTAX_TELEX_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_TELEX_NAME);
+ logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+ OMR_CASE_IGNORE_OID, SYNTAX_TELEX_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_TELEX_NAME);
+ logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+ SMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME));
}
}
@@ -225,7 +221,7 @@
* this syntax, or <CODE>false</CODE> if not.
*/
public boolean valueIsAcceptable(ByteString value,
- StringBuilder invalidReason)
+ MessageBuilder invalidReason)
{
// Get a string representation of the value and find its length.
String valueString = value.stringValue();
@@ -233,8 +229,8 @@
if (valueLength < 5)
{
- int msgID = MSGID_ATTR_SYNTAX_TELEX_TOO_SHORT;
- invalidReason.append(getMessage(msgID, valueString));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELEX_TOO_SHORT.get(valueString));
return false;
}
@@ -243,8 +239,9 @@
char c = valueString.charAt(0);
if (! PrintableString.isPrintableCharacter(c))
{
- int msgID = MSGID_ATTR_SYNTAX_TELEX_NOT_PRINTABLE;
- invalidReason.append(getMessage(msgID, valueString, c, 0));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELEX_NOT_PRINTABLE.get(
+ valueString, String.valueOf(c), 0));
return false;
}
@@ -264,16 +261,17 @@
{
if (! PrintableString.isPrintableCharacter(c))
{
- int msgID = MSGID_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR;
- invalidReason.append(getMessage(msgID, valueString, c, pos));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR.get(
+ valueString, String.valueOf(c), pos));
}
}
}
if (pos >= valueLength)
{
- int msgID = MSGID_ATTR_SYNTAX_TELEX_TRUNCATED;
- invalidReason.append(getMessage(msgID, valueString));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELEX_TRUNCATED.get(valueString));
return false;
}
@@ -282,8 +280,9 @@
c = valueString.charAt(pos++);
if (! PrintableString.isPrintableCharacter(c))
{
- int msgID = MSGID_ATTR_SYNTAX_TELEX_NOT_PRINTABLE;
- invalidReason.append(getMessage(msgID, valueString, c, (pos-1)));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELEX_NOT_PRINTABLE.get(
+ valueString, String.valueOf(c), (pos-1)));
return false;
}
@@ -302,8 +301,9 @@
{
if (! PrintableString.isPrintableCharacter(c))
{
- int msgID = MSGID_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR;
- invalidReason.append(getMessage(msgID, valueString, c, pos));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR.get(
+ valueString, String.valueOf(c), pos));
return false;
}
}
@@ -311,8 +311,8 @@
if (pos >= valueLength)
{
- int msgID = MSGID_ATTR_SYNTAX_TELEX_TRUNCATED;
- invalidReason.append(getMessage(msgID, valueString));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELEX_TRUNCATED.get(valueString));
return false;
}
@@ -321,8 +321,9 @@
c = valueString.charAt(pos++);
if (! PrintableString.isPrintableCharacter(c))
{
- int msgID = MSGID_ATTR_SYNTAX_TELEX_NOT_PRINTABLE;
- invalidReason.append(getMessage(msgID, valueString, c, (pos-1)));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELEX_NOT_PRINTABLE.get(
+ valueString, String.valueOf(c), (pos-1)));
return false;
}
@@ -334,8 +335,9 @@
c = valueString.charAt(pos);
if (! PrintableString.isPrintableCharacter(c))
{
- int msgID = MSGID_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR;
- invalidReason.append(getMessage(msgID, valueString, c, pos));
+
+ invalidReason.append(ERR_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR.get(
+ valueString, String.valueOf(c), pos));
return false;
}
}
--
Gitblit v1.10.0