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/extensions/DictionaryPasswordValidator.java |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java
index d11d987..065b66b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/DictionaryPasswordValidator.java
@@ -25,6 +25,7 @@
  *      Portions Copyright 2007 Sun Microsystems, Inc.
  */
 package org.opends.server.extensions;
+import org.opends.messages.Message;
 
 
 
@@ -52,8 +53,8 @@
 
 import static org.opends.server.loggers.debug.DebugLogger.*;
 import org.opends.server.loggers.debug.DebugTracer;
-import static org.opends.server.messages.ExtensionsMessages.*;
-import static org.opends.server.messages.MessageHandler.*;
+import static org.opends.messages.ExtensionMessages.*;
+import org.opends.messages.MessageBuilder;
 import static org.opends.server.util.StaticUtils.*;
 
 
@@ -126,7 +127,7 @@
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
                                       Operation operation, Entry userEntry,
-                                      StringBuilder invalidReason)
+                                      MessageBuilder invalidReason)
   {
     // Get a handle to the current configuration.
     DictionaryPasswordValidatorCfg config = currentConfig;
@@ -143,8 +144,8 @@
 
     if (dictionary.contains(password))
     {
-      int msgID = MSGID_DICTIONARY_VALIDATOR_PASSWORD_IN_DICTIONARY;
-      invalidReason.append(getMessage(msgID));
+      invalidReason.append(
+              ERR_DICTIONARY_VALIDATOR_PASSWORD_IN_DICTIONARY.get());
       return false;
     }
 
@@ -154,8 +155,8 @@
     {
       if (dictionary.contains(new StringBuilder(password).reverse().toString()))
       {
-        int msgID = MSGID_DICTIONARY_VALIDATOR_PASSWORD_IN_DICTIONARY;
-        invalidReason.append(getMessage(msgID));
+        invalidReason.append(
+                ERR_DICTIONARY_VALIDATOR_PASSWORD_IN_DICTIONARY.get());
         return false;
       }
     }
@@ -187,9 +188,9 @@
     File dictionaryFile = getFileForPath(configuration.getDictionaryFile());
     if (! dictionaryFile.exists())
     {
-      int    msgID   = MSGID_DICTIONARY_VALIDATOR_NO_SUCH_FILE;
-      String message = getMessage(msgID, configuration.getDictionaryFile());
-      throw new ConfigException(msgID, message);
+      Message message = ERR_DICTIONARY_VALIDATOR_NO_SUCH_FILE.get(
+          configuration.getDictionaryFile());
+      throw new ConfigException(message);
     }
 
 
@@ -218,10 +219,9 @@
         TRACER.debugCaught(DebugLogLevel.ERROR, e);
       }
 
-      int    msgID   = MSGID_DICTIONARY_VALIDATOR_CANNOT_READ_FILE;
-      String message = getMessage(msgID, configuration.getDictionaryFile(),
-                                  String.valueOf(e));
-      throw new InitializationException(msgID, message);
+      Message message = ERR_DICTIONARY_VALIDATOR_CANNOT_READ_FILE.get(
+          configuration.getDictionaryFile(), String.valueOf(e));
+      throw new InitializationException(message);
     }
     finally
     {
@@ -244,7 +244,7 @@
    */
   @Override()
   public boolean isConfigurationAcceptable(PasswordValidatorCfg configuration,
-                                           List<String> unacceptableReasons)
+                                           List<Message> unacceptableReasons)
   {
     DictionaryPasswordValidatorCfg config =
          (DictionaryPasswordValidatorCfg) configuration;
@@ -258,7 +258,7 @@
    */
   public boolean isConfigurationChangeAcceptable(
                       DictionaryPasswordValidatorCfg configuration,
-                      List<String> unacceptableReasons)
+                      List<Message> unacceptableReasons)
   {
     // Make sure that we can load the dictionary.  If so, then we'll accept the
     // new configuration.
@@ -268,12 +268,12 @@
     }
     catch (ConfigException ce)
     {
-      unacceptableReasons.add(ce.getMessage());
+      unacceptableReasons.add(ce.getMessageObject());
       return false;
     }
     catch (InitializationException ie)
     {
-      unacceptableReasons.add(ie.getMessage());
+      unacceptableReasons.add(ie.getMessageObject());
       return false;
     }
     catch (Exception e)
@@ -295,7 +295,7 @@
   {
     ResultCode        resultCode          = ResultCode.SUCCESS;
     boolean           adminActionRequired = false;
-    ArrayList<String> messages            = new ArrayList<String>();
+    ArrayList<Message> messages            = new ArrayList<Message>();
 
 
     // Make sure we can load the dictionary.  If we can, then activate the new

--
Gitblit v1.10.0