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/PasswordPolicyConfig.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java b/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java
index 464fe20..0feb81b 100644
--- a/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java
+++ b/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.core;
+import org.opends.messages.Message;
import java.util.ArrayList;
import java.util.List;
@@ -39,8 +40,8 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
-import static org.opends.server.messages.CoreMessages.*;
-import static org.opends.server.messages.MessageHandler.getMessage;
+import static org.opends.messages.CoreMessages.*;
+
/**
This class is the interface between the password policy configurable component
@@ -84,7 +85,7 @@
* {@inheritDoc}
*/
public boolean isConfigurationChangeAcceptable(
- PasswordPolicyCfg configuration, List<String> unacceptableReasons)
+ PasswordPolicyCfg configuration, List<Message> unacceptableReasons)
{
assert configuration.dn().equals(this.currentPolicy.getConfigEntryDN() )
: "Internal Error: mismatch between DN of configuration entry and"
@@ -101,7 +102,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ce);
}
- unacceptableReasons.add(ce.getMessage());
+ unacceptableReasons.add(ce.getMessageObject());
return false;
}
catch (InitializationException ie)
@@ -111,7 +112,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, ie);
}
- unacceptableReasons.add(ie.getMessage());
+ unacceptableReasons.add(ie.getMessageObject());
return false;
}
@@ -143,8 +144,8 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, ce);
}
- ArrayList<String> messages = new ArrayList<String>();
- messages.add(ce.getMessage());
+ ArrayList<Message> messages = new ArrayList<Message>();
+ messages.add(ce.getMessageObject());
return new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(),
/*adminActionRequired*/ true, messages);
@@ -155,8 +156,8 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, ie);
}
- ArrayList<String> messages = new ArrayList<String>();
- messages.add(ie.getMessage());
+ ArrayList<Message> messages = new ArrayList<Message>();
+ messages.add(ie.getMessageObject());
return new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(),
/*adminActionRequired*/ true, messages);
@@ -164,10 +165,9 @@
// If we've made it here, then everything is acceptable. Apply the new
// configuration.
- ArrayList<String> messages = new ArrayList<String>();
- int msgID = MSGID_PWPOLICY_UPDATED_POLICY;
- messages.add(getMessage(msgID, String.valueOf(p.getConfigEntryDN())));
-
+ ArrayList<Message> messages = new ArrayList<Message>();
+ messages.add(INFO_PWPOLICY_UPDATED_POLICY.get(
+ String.valueOf(p.getConfigEntryDN())));
this.currentPolicy = p;
return new ConfigChangeResult(ResultCode.SUCCESS,
--
Gitblit v1.10.0