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/EnhancedGuideSyntax.java |   56 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
index ca69b8a..7892263 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
@@ -37,17 +37,16 @@
 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.*;
 import static org.opends.server.util.StaticUtils.*;
 
 
-
 /**
  * This class implements the enhanced guide attribute syntax, which may be used
  * to provide criteria for generating search filters for entries of a given
@@ -90,27 +89,24 @@
          DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
     if (defaultEqualityMatchingRule == null)
     {
-      logError(ErrorLogCategory.SCHEMA, ErrorLogSeverity.SEVERE_ERROR,
-               MSGID_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
-               EMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME);
+      logError(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
+          EMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME));
     }
 
     defaultOrderingMatchingRule =
          DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
     if (defaultOrderingMatchingRule == null)
     {
-      logError(ErrorLogCategory.SCHEMA, ErrorLogSeverity.SEVERE_ERROR,
-               MSGID_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
-               OMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME);
+      logError(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
+          OMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME));
     }
 
     defaultSubstringMatchingRule =
          DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
     if (defaultSubstringMatchingRule == null)
     {
-      logError(ErrorLogCategory.SCHEMA, ErrorLogSeverity.SEVERE_ERROR,
-               MSGID_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
-               SMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME);
+      logError(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
+          SMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME));
     }
   }
 
@@ -226,7 +222,7 @@
    *          this syntax, or <CODE>false</CODE> if not.
    */
   public boolean valueIsAcceptable(ByteString value,
-                                   StringBuilder invalidReason)
+                                   MessageBuilder invalidReason)
   {
     // Get a lowercase string version of the provided value.
     String valueStr = toLowerCase(value.stringValue());
@@ -237,8 +233,9 @@
     int sharpPos = valueStr.indexOf('#');
     if (sharpPos < 0)
     {
-      int msgID = MSGID_ATTR_SYNTAX_ENHANCEDGUIDE_NO_SHARP;
-      invalidReason.append(getMessage(msgID, valueStr));
+
+      invalidReason.append(
+              ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_SHARP.get(valueStr));
       return false;
     }
 
@@ -248,8 +245,8 @@
     int    ocLength = ocName.length();
     if (ocLength == 0)
     {
-      int msgID = MSGID_ATTR_SYNTAX_ENHANCEDGUIDE_NO_OC;
-      invalidReason.append(getMessage(msgID, valueStr));
+
+      invalidReason.append(ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_OC.get(valueStr));
       return false;
     }
 
@@ -263,8 +260,9 @@
     int lastSharpPos = valueStr.lastIndexOf('#');
     if (lastSharpPos == sharpPos)
     {
-      int msgID = MSGID_ATTR_SYNTAX_ENHANCEDGUIDE_NO_FINAL_SHARP;
-      invalidReason.append(getMessage(msgID, valueStr));
+
+      invalidReason.append(
+              ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_FINAL_SHARP.get(valueStr));
       return false;
     }
 
@@ -275,13 +273,16 @@
     {
       if (scopeStr.length() == 0)
       {
-        int msgID = MSGID_ATTR_SYNTAX_ENHANCEDGUIDE_NO_SCOPE;
-        invalidReason.append(getMessage(msgID, valueStr));
+
+        invalidReason.append(
+                ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_SCOPE.get(valueStr));
       }
       else
       {
-        int msgID = MSGID_ATTR_SYNTAX_ENHANCEDGUIDE_INVALID_SCOPE;
-        invalidReason.append(getMessage(msgID, valueStr, scopeStr));
+
+        invalidReason.append(
+                ERR_ATTR_SYNTAX_ENHANCEDGUIDE_INVALID_SCOPE.get(
+                        valueStr, scopeStr));
       }
 
       return false;
@@ -294,8 +295,9 @@
     int    criteriaLength = criteria.length();
     if (criteriaLength == 0)
     {
-      int msgID = MSGID_ATTR_SYNTAX_ENHANCEDGUIDE_NO_CRITERIA;
-      invalidReason.append(getMessage(msgID, valueStr));
+
+      invalidReason.append(
+              ERR_ATTR_SYNTAX_ENHANCEDGUIDE_NO_CRITERIA.get(valueStr));
       return false;
     }
 

--
Gitblit v1.10.0