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/OtherMailboxSyntax.java |   50 ++++++++++++++++++++++++++------------------------
 1 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java
index 036658b..a951ac3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.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 other mailbox attribute syntax, which consists of a
  * printable string component (the mailbox type) followed by a dollar sign and
@@ -87,18 +86,16 @@
          DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_LIST_OID);
     if (defaultEqualityMatchingRule == null)
     {
-      logError(ErrorLogCategory.SCHEMA, ErrorLogSeverity.SEVERE_ERROR,
-               MSGID_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
-               EMR_CASE_IGNORE_LIST_OID, SYNTAX_OTHER_MAILBOX_NAME);
+      logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+          EMR_CASE_IGNORE_LIST_OID, SYNTAX_OTHER_MAILBOX_NAME));
     }
 
     defaultSubstringMatchingRule =
          DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_LIST_OID);
     if (defaultSubstringMatchingRule == null)
     {
-      logError(ErrorLogCategory.SCHEMA, ErrorLogSeverity.SEVERE_ERROR,
-               MSGID_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
-               SMR_CASE_IGNORE_LIST_OID, SYNTAX_OTHER_MAILBOX_NAME);
+      logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+          SMR_CASE_IGNORE_LIST_OID, SYNTAX_OTHER_MAILBOX_NAME));
     }
   }
 
@@ -215,14 +212,14 @@
    *          this syntax, or <CODE>false</CODE> if not.
    */
   public boolean valueIsAcceptable(ByteString value,
-                                   StringBuilder invalidReason)
+                                   MessageBuilder invalidReason)
   {
     // Check to see if the provided value was null.  If so, then that's not
     // acceptable.
     if (value == null)
     {
-      int msgID = MSGID_ATTR_SYNTAX_OTHER_MAILBOX_EMPTY_VALUE;
-      invalidReason.append(getMessage(msgID));
+
+      invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_EMPTY_VALUE.get());
       return false;
     }
 
@@ -233,8 +230,8 @@
     int    valueLength = valueString.length();
     if (valueLength == 0)
     {
-      int msgID = MSGID_ATTR_SYNTAX_OTHER_MAILBOX_EMPTY_VALUE;
-      invalidReason.append(getMessage(msgID));
+
+      invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_EMPTY_VALUE.get());
       return false;
     }
 
@@ -249,8 +246,9 @@
       {
         if (pos == 0)
         {
-          int msgID = MSGID_ATTR_SYNTAX_OTHER_MAILBOX_NO_MBTYPE;
-          invalidReason.append(getMessage(msgID, valueString));
+
+          invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_NO_MBTYPE.get(
+                  valueString));
           return false;
         }
 
@@ -259,8 +257,10 @@
       }
       else if (! PrintableString.isPrintableCharacter(c))
       {
-        int msgID = MSGID_ATTR_SYNTAX_OTHER_MAILBOX_ILLEGAL_MBTYPE_CHAR;
-        invalidReason.append(getMessage(msgID, valueString, c, pos));
+
+        invalidReason.append(
+                ERR_ATTR_SYNTAX_OTHER_MAILBOX_ILLEGAL_MBTYPE_CHAR.get(
+                        valueString, String.valueOf(c), pos));
         return false;
       }
     }
@@ -269,8 +269,9 @@
     // Make sure there is at least one character left for the mailbox.
     if (pos >= valueLength)
     {
-      int msgID = MSGID_ATTR_SYNTAX_OTHER_MAILBOX_NO_MAILBOX;
-      invalidReason.append(getMessage(msgID, valueString));
+
+      invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_NO_MAILBOX.get(
+              valueString));
       return false;
     }
 
@@ -281,8 +282,9 @@
       char c = valueString.charAt(pos);
       if (c != (c & 0x7F))
       {
-        int msgID = MSGID_ATTR_SYNTAX_OTHER_MAILBOX_ILLEGAL_MB_CHAR;
-        invalidReason.append(getMessage(msgID, valueString, c, pos));
+
+        invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_ILLEGAL_MB_CHAR.get(
+                valueString, String.valueOf(c), pos));
         return false;
       }
     }

--
Gitblit v1.10.0