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/core/CoreConfigManager.java |   47 +++++++++++++++++++++--------------------------
 1 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/CoreConfigManager.java b/opends/src/server/org/opends/server/core/CoreConfigManager.java
index c643145..13960ac 100644
--- a/opends/src/server/org/opends/server/core/CoreConfigManager.java
+++ b/opends/src/server/org/opends/server/core/CoreConfigManager.java
@@ -25,6 +25,7 @@
  *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.core;
+import org.opends.messages.Message;
 
 
 
@@ -49,8 +50,8 @@
 import org.opends.server.types.ResultCode;
 import org.opends.server.types.WritabilityMode;
 
-import static org.opends.server.messages.ConfigMessages.*;
-import static org.opends.server.messages.MessageHandler.*;
+import static org.opends.messages.ConfigMessages.*;
+
 import static org.opends.server.util.ServerConstants.*;
 
 
@@ -110,9 +111,8 @@
         int colonPos = server.indexOf(':');
         if ((colonPos == 0) || (colonPos == (server.length()-1)))
         {
-          int    msgID   = MSGID_CONFIG_CORE_INVALID_SMTP_SERVER;
-          String message = getMessage(msgID, server);
-          throw new ConfigException(msgID, message);
+          Message message = ERR_CONFIG_CORE_INVALID_SMTP_SERVER.get(server);
+          throw new ConfigException(message);
         }
         else if (colonPos > 0)
         {
@@ -121,16 +121,14 @@
             int port = Integer.parseInt(server.substring(colonPos+1));
             if ((port < 1) || (port > 65535))
             {
-              int    msgID   = MSGID_CONFIG_CORE_INVALID_SMTP_SERVER;
-              String message = getMessage(msgID, server);
-              throw new ConfigException(msgID, message);
+              Message message = ERR_CONFIG_CORE_INVALID_SMTP_SERVER.get(server);
+              throw new ConfigException(message);
             }
           }
           catch (Exception e)
           {
-            int    msgID   = MSGID_CONFIG_CORE_INVALID_SMTP_SERVER;
-            String message = getMessage(msgID, server);
-            throw new ConfigException(msgID, message, e);
+            Message message = ERR_CONFIG_CORE_INVALID_SMTP_SERVER.get(server);
+            throw new ConfigException(message, e);
           }
         }
       }
@@ -347,7 +345,7 @@
    * {@inheritDoc}
    */
   public boolean isConfigurationChangeAcceptable(GlobalCfg configuration,
-                      List<String> unacceptableReasons)
+                      List<Message> unacceptableReasons)
   {
     boolean configAcceptable = true;
 
@@ -356,8 +354,8 @@
     PasswordPolicy policy = DirectoryServer.getPasswordPolicy(policyDN);
     if (policy == null)
     {
-      int    msgID   = MSGID_CONFIG_CORE_NO_SUCH_PWPOLICY;
-      String message = getMessage(msgID, String.valueOf(policyDN));
+      Message message = ERR_CONFIG_CORE_NO_SUCH_PWPOLICY.get(
+              String.valueOf(policyDN));
       unacceptableReasons.add(message);
 
       configAcceptable = false;
@@ -368,9 +366,9 @@
     IdentityMapper mapper = DirectoryServer.getIdentityMapper(mapperDN);
     if (mapper == null)
     {
-      int    msgID   = MSGID_CONFIG_CORE_NO_PROXY_MAPPER_FOR_DN;
-      String message = getMessage(msgID, String.valueOf(mapperDN),
-                                  String.valueOf(configuration.dn()));
+      Message message = ERR_CONFIG_CORE_NO_PROXY_MAPPER_FOR_DN.get(
+              String.valueOf(mapperDN),
+              String.valueOf(configuration.dn()));
       unacceptableReasons.add(message);
 
       configAcceptable = false;
@@ -384,8 +382,7 @@
         int colonPos = server.indexOf(':');
         if ((colonPos == 0) || (colonPos == (server.length()-1)))
         {
-          int    msgID   = MSGID_CONFIG_CORE_INVALID_SMTP_SERVER;
-          String message = getMessage(msgID, server);
+          Message message = ERR_CONFIG_CORE_INVALID_SMTP_SERVER.get(server);
           unacceptableReasons.add(message);
           configAcceptable = false;
         }
@@ -396,16 +393,14 @@
             int port = Integer.parseInt(server.substring(colonPos+1));
             if ((port < 1) || (port > 65535))
             {
-              int    msgID   = MSGID_CONFIG_CORE_INVALID_SMTP_SERVER;
-              String message = getMessage(msgID, server);
+              Message message = ERR_CONFIG_CORE_INVALID_SMTP_SERVER.get(server);
               unacceptableReasons.add(message);
               configAcceptable = false;
             }
           }
           catch (Exception e)
           {
-            int    msgID   = MSGID_CONFIG_CORE_INVALID_SMTP_SERVER;
-            String message = getMessage(msgID, server);
+            Message message = ERR_CONFIG_CORE_INVALID_SMTP_SERVER.get(server);
             unacceptableReasons.add(message);
             configAcceptable = false;
           }
@@ -423,9 +418,9 @@
    */
   public ConfigChangeResult applyConfigurationChange(GlobalCfg configuration)
   {
-    ResultCode        resultCode          = ResultCode.SUCCESS;
-    boolean           adminActionRequired = false;
-    ArrayList<String> messages            = new ArrayList<String>();
+    ResultCode         resultCode          = ResultCode.SUCCESS;
+    boolean            adminActionRequired = false;
+    ArrayList<Message> messages            = new ArrayList<Message>();
 
     applyGlobalConfiguration(configuration);
 

--
Gitblit v1.10.0