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/PasswordStorageSchemeConfigManager.java | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java b/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
index 36a8c5d..92f60a6 100644
--- a/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
+++ b/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
@@ -25,11 +25,12 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.core;
+import org.opends.messages.Message;
-import static org.opends.server.messages.ConfigMessages.*;
-import static org.opends.server.messages.MessageHandler.getMessage;
+import static org.opends.messages.ConfigMessages.*;
+
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import java.lang.reflect.Method;
@@ -137,7 +138,7 @@
*/
public boolean isConfigurationChangeAcceptable(
PasswordStorageSchemeCfg configuration,
- List<String> unacceptableReasons
+ List<Message> unacceptableReasons
)
{
// returned status -- all is fine by default
@@ -155,7 +156,7 @@
}
catch (InitializationException ie)
{
- unacceptableReasons.add(ie.getMessage());
+ unacceptableReasons.add(ie.getMessageObject());
status = false;
}
}
@@ -174,7 +175,7 @@
{
// Returned result.
ConfigChangeResult changeResult = new ConfigChangeResult(
- ResultCode.SUCCESS, false, new ArrayList<String>()
+ ResultCode.SUCCESS, false, new ArrayList<Message>()
);
// Get the configuration entry DN and the associated
@@ -220,7 +221,7 @@
}
catch (InitializationException ie)
{
- changeResult.addMessage (ie.getMessage());
+ changeResult.addMessage (ie.getMessageObject());
changeResult.setResultCode (DirectoryServer.getServerErrorResultCode());
return changeResult;
}
@@ -235,7 +236,7 @@
*/
public boolean isConfigurationAddAcceptable(
PasswordStorageSchemeCfg configuration,
- List<String> unacceptableReasons
+ List<Message> unacceptableReasons
)
{
// returned status -- all is fine by default
@@ -245,8 +246,8 @@
DN configEntryDN = configuration.dn();
if (storageSchemes.containsKey(configEntryDN))
{
- int msgID = MSGID_CONFIG_PWSCHEME_EXISTS;
- String message = getMessage(msgID, String.valueOf(configEntryDN));
+ Message message = ERR_CONFIG_PWSCHEME_EXISTS.get(
+ String.valueOf(configEntryDN));
unacceptableReasons.add (message);
status = false;
}
@@ -264,7 +265,7 @@
}
catch (InitializationException ie)
{
- unacceptableReasons.add (ie.getMessage());
+ unacceptableReasons.add (ie.getMessageObject());
status = false;
}
}
@@ -283,7 +284,7 @@
{
// Returned result.
ConfigChangeResult changeResult = new ConfigChangeResult(
- ResultCode.SUCCESS, false, new ArrayList<String>()
+ ResultCode.SUCCESS, false, new ArrayList<Message>()
);
// Register a change listener with it so we can be notified of changes
@@ -301,7 +302,7 @@
}
catch (InitializationException ie)
{
- changeResult.addMessage (ie.getMessage());
+ changeResult.addMessage (ie.getMessageObject());
changeResult.setResultCode (DirectoryServer.getServerErrorResultCode());
return changeResult;
}
@@ -317,7 +318,7 @@
*/
public boolean isConfigurationDeleteAcceptable(
PasswordStorageSchemeCfg configuration,
- List<String> unacceptableReasons
+ List<Message> unacceptableReasons
)
{
// A delete should always be acceptable, so just return true.
@@ -335,7 +336,7 @@
{
// Returned result.
ConfigChangeResult changeResult = new ConfigChangeResult(
- ResultCode.SUCCESS, false, new ArrayList<String>()
+ ResultCode.SUCCESS, false, new ArrayList<Message>()
);
uninstallPasswordStorageScheme (configuration.dn());
@@ -432,7 +433,7 @@
"isConfigurationAcceptable",
PasswordStorageSchemeCfg.class, List.class);
- List<String> unacceptableReasons = new ArrayList<String>();
+ List<Message> unacceptableReasons = new ArrayList<Message>();
Boolean acceptable = (Boolean) method.invoke(passwordStorageScheme,
configuration,
unacceptableReasons);
@@ -441,7 +442,7 @@
StringBuilder buffer = new StringBuilder();
if (! unacceptableReasons.isEmpty())
{
- Iterator<String> iterator = unacceptableReasons.iterator();
+ Iterator<Message> iterator = unacceptableReasons.iterator();
buffer.append(iterator.next());
while (iterator.hasNext())
{
@@ -450,10 +451,9 @@
}
}
- int msgID = MSGID_CONFIG_PWSCHEME_CONFIG_NOT_ACCEPTABLE;
- String message = getMessage(msgID, String.valueOf(configuration.dn()),
- buffer.toString());
- throw new InitializationException(msgID, message);
+ Message message = ERR_CONFIG_PWSCHEME_CONFIG_NOT_ACCEPTABLE.get(
+ String.valueOf(configuration.dn()), buffer.toString());
+ throw new InitializationException(message);
}
}
@@ -461,13 +461,11 @@
}
catch (Exception e)
{
- int msgID = MSGID_CONFIG_PWSCHEME_INITIALIZATION_FAILED;
- String message = getMessage(
- msgID, className,
+ Message message = ERR_CONFIG_PWSCHEME_INITIALIZATION_FAILED.get(className,
String.valueOf(configuration.dn()),
stackTraceToSingleLineString(e)
);
- throw new InitializationException(msgID, message, e);
+ throw new InitializationException(message, e);
}
}
--
Gitblit v1.10.0