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/LogRetentionPolicyConfigManager.java | 50 +++++++++++++++++++++++---------------------------
1 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java b/opends/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java
index ae99da9..03c6cd7 100644
--- a/opends/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java
+++ b/opends/src/server/org/opends/server/core/LogRetentionPolicyConfigManager.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.core;
+import org.opends.messages.Message;
import org.opends.server.admin.std.server.LogRetentionPolicyCfg;
import org.opends.server.admin.std.server.RootCfg;
@@ -43,8 +44,8 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
-import static org.opends.server.messages.MessageHandler.getMessage;
-import static org.opends.server.messages.ConfigMessages.*;
+import static org.opends.messages.ConfigMessages.*;
+
import static org.opends.server.util.StaticUtils.*;
import java.util.List;
@@ -104,7 +105,7 @@
*/
public boolean isConfigurationAddAcceptable(
LogRetentionPolicyCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
return isJavaClassAcceptable(configuration, unacceptableReasons);
}
@@ -114,7 +115,7 @@
*/
public boolean isConfigurationDeleteAcceptable(
LogRetentionPolicyCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
// TODO: Make sure nothing is using this policy before deleting it.
return true;
@@ -128,7 +129,7 @@
// Default result code.
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
try
{
@@ -141,16 +142,17 @@
{
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- messages.add(e.getMessage());
+ messages.add(e.getMessageObject());
resultCode = DirectoryServer.getServerErrorResultCode();
} catch (Exception e) {
if (debugEnabled())
{
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_CONFIG_RETENTION_POLICY_CANNOT_CREATE_POLICY;
- messages.add(getMessage(msgID, String.valueOf(config.dn().toString()),
- stackTraceToSingleLineString(e)));
+
+ messages.add(ERR_CONFIG_RETENTION_POLICY_CANNOT_CREATE_POLICY.get(
+ String.valueOf(config.dn().toString()),
+ stackTraceToSingleLineString(e)));
resultCode = DirectoryServer.getServerErrorResultCode();
}
@@ -166,7 +168,7 @@
// Default result code.
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
RetentionPolicy policy = DirectoryServer.getRetentionPolicy(config.dn());
if(policy != null)
@@ -187,7 +189,7 @@
*/
public boolean isConfigurationChangeAcceptable(
LogRetentionPolicyCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
return isJavaClassAcceptable(configuration, unacceptableReasons);
}
@@ -201,7 +203,7 @@
// Default result code.
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
RetentionPolicy policy =
DirectoryServer.getRetentionPolicy(configuration.dn());
@@ -215,7 +217,7 @@
}
private boolean isJavaClassAcceptable(LogRetentionPolicyCfg config,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
String className = config.getJavaImplementationClass();
LogRetentionPolicyCfgDefn d = LogRetentionPolicyCfgDefn.getInstance();
@@ -227,8 +229,7 @@
theClass = pd.loadClass(className, RetentionPolicy.class);
theClass.newInstance();
} catch (Exception e) {
- int msgID = MSGID_CONFIG_RETENTION_POLICY_INVALID_CLASS;
- String message = getMessage(msgID, className,
+ Message message = ERR_CONFIG_RETENTION_POLICY_INVALID_CLASS.get(className,
config.dn().toString(),
String.valueOf(e));
unacceptableReasons.add(message);
@@ -242,8 +243,7 @@
theClass.getMethod("initializeLogRetentionPolicy", config.definition()
.getServerConfigurationClass());
} catch (Exception e) {
- int msgID = MSGID_CONFIG_RETENTION_POLICY_INVALID_CLASS;
- String message = getMessage(msgID, className,
+ Message message = ERR_CONFIG_RETENTION_POLICY_INVALID_CLASS.get(className,
config.dn().toString(),
String.valueOf(e));
unacceptableReasons.add(message);
@@ -277,17 +277,13 @@
{
// Rethrow the exceptions thrown be the invoked method.
Throwable e = ite.getTargetException();
- int msgID = MSGID_CONFIG_RETENTION_POLICY_INVALID_CLASS;
- String message = getMessage(msgID, className,
- config.dn().toString(),
- stackTraceToSingleLineString(e));
- throw new ConfigException(msgID, message, e);
+ Message message = ERR_CONFIG_RETENTION_POLICY_INVALID_CLASS.get(
+ className, config.dn().toString(), stackTraceToSingleLineString(e));
+ throw new ConfigException(message, e);
} catch (Exception e) {
- int msgID = MSGID_CONFIG_RETENTION_POLICY_INVALID_CLASS;
- String message = getMessage(msgID, className,
- config.dn().toString(),
- String.valueOf(e));
- throw new ConfigException(msgID, message, e);
+ Message message = ERR_CONFIG_RETENTION_POLICY_INVALID_CLASS.get(
+ className, config.dn().toString(), String.valueOf(e));
+ throw new ConfigException(message, e);
}
// The connection handler has been successfully initialized.
--
Gitblit v1.10.0