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/ConnectionHandlerConfigManager.java | 80 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java b/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
index fb8b77c..93adfa7 100644
--- a/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -25,14 +25,15 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.core;
+import org.opends.messages.Message;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
-import static org.opends.server.messages.ConfigMessages.*;
-import static org.opends.server.messages.CoreMessages.*;
-import static org.opends.server.messages.MessageHandler.getMessage;
+import static org.opends.messages.ConfigMessages.*;
+import static org.opends.messages.CoreMessages.*;
+
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import java.lang.reflect.Method;
@@ -97,7 +98,7 @@
// Default result code.
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
// Register as a change listener for this connection handler entry
// so that we will be notified of any changes that may be made to
@@ -126,7 +127,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- messages.add(e.getMessage());
+ messages.add(e.getMessageObject());
resultCode = DirectoryServer.getServerErrorResultCode();
} catch (Exception e) {
if (debugEnabled())
@@ -134,9 +135,10 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_CONFIG_CONNHANDLER_CANNOT_INITIALIZE;
- messages.add(getMessage(msgID, String.valueOf(configuration
- .getJavaImplementationClass()), String.valueOf(dn),
+
+ messages.add(ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
+ String.valueOf(configuration.getJavaImplementationClass()),
+ String.valueOf(dn),
stackTraceToSingleLineString(e)));
resultCode = DirectoryServer.getServerErrorResultCode();
}
@@ -162,7 +164,7 @@
// Default result code.
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
// See whether the connection handler should be enabled.
if (connectionHandler == null) {
@@ -188,7 +190,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- messages.add(e.getMessage());
+ messages.add(e.getMessageObject());
resultCode = DirectoryServer.getServerErrorResultCode();
} catch (Exception e) {
if (debugEnabled())
@@ -196,8 +198,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_CONFIG_CONNHANDLER_CANNOT_INITIALIZE;
- messages.add(getMessage(msgID, String.valueOf(configuration
+ messages.add(ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
+ String.valueOf(configuration
.getJavaImplementationClass()), String.valueOf(dn),
stackTraceToSingleLineString(e)));
resultCode = DirectoryServer.getServerErrorResultCode();
@@ -220,9 +222,9 @@
.deregisterConnectionHandler(connectionHandler);
connectionHandlers.remove(dn);
- int id = MSGID_CONNHANDLER_CLOSED_BY_DISABLE;
- connectionHandler.finalizeConnectionHandler(getMessage(id),
- false);
+
+ connectionHandler.finalizeConnectionHandler(
+ INFO_CONNHANDLER_CLOSED_BY_DISABLE.get(), false);
}
}
@@ -251,9 +253,9 @@
if (connectionHandler != null) {
DirectoryServer.deregisterConnectionHandler(connectionHandler);
- int id = MSGID_CONNHANDLER_CLOSED_BY_DELETE;
- connectionHandler.finalizeConnectionHandler(getMessage(id),
- false);
+ connectionHandler.finalizeConnectionHandler(
+ INFO_CONNHANDLER_CLOSED_BY_DELETE.get(),
+ false);
}
return new ConfigChangeResult(resultCode, adminActionRequired);
@@ -326,7 +328,7 @@
*/
public boolean isConfigurationAddAcceptable(
ConnectionHandlerCfg configuration,
- List<String> unacceptableReasons) {
+ List<Message> unacceptableReasons) {
if (configuration.isEnabled()) {
// It's enabled so always validate the class.
return isJavaClassAcceptable(configuration, unacceptableReasons);
@@ -343,7 +345,7 @@
*/
public boolean isConfigurationChangeAcceptable(
ConnectionHandlerCfg configuration,
- List<String> unacceptableReasons) {
+ List<Message> unacceptableReasons) {
if (configuration.isEnabled()) {
// It's enabled so always validate the class.
return isJavaClassAcceptable(configuration, unacceptableReasons);
@@ -360,7 +362,7 @@
*/
public boolean isConfigurationDeleteAcceptable(
ConnectionHandlerCfg configuration,
- List<String> unacceptableReasons) {
+ List<Message> unacceptableReasons) {
// A delete should always be acceptable, so just return true.
return true;
}
@@ -391,11 +393,10 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_CONFIG_CONNHANDLER_CANNOT_INITIALIZE;
- String message = getMessage(msgID, String.valueOf(className),
- String.valueOf(config.dn()),
- stackTraceToSingleLineString(e));
- throw new ConfigException(msgID, message, e);
+ Message message = ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.
+ get(String.valueOf(className), String.valueOf(config.dn()),
+ stackTraceToSingleLineString(e));
+ throw new ConfigException(message, e);
}
// Perform the necessary initialization for the connection
@@ -415,11 +416,10 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_CONFIG_CONNHANDLER_CANNOT_INITIALIZE;
- String message = getMessage(msgID, String.valueOf(className),
- String.valueOf(config.dn()),
- stackTraceToSingleLineString(e));
- throw new ConfigException(msgID, message, e);
+ Message message = ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.
+ get(String.valueOf(className), String.valueOf(config.dn()),
+ stackTraceToSingleLineString(e));
+ throw new ConfigException(message, e);
}
// The connection handler has been successfully initialized.
@@ -433,7 +433,7 @@
// class is acceptable.
private boolean isJavaClassAcceptable(
ConnectionHandlerCfg config,
- List<String> unacceptableReasons) {
+ List<Message> unacceptableReasons) {
String className = config.getJavaImplementationClass();
ConnectionHandlerCfgDefn d =
ConnectionHandlerCfgDefn.getInstance();
@@ -452,10 +452,11 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_CONFIG_CONNHANDLER_CANNOT_INITIALIZE;
- unacceptableReasons.add(getMessage(msgID, String
- .valueOf(className), String.valueOf(config.dn()),
- stackTraceToSingleLineString(e)));
+ unacceptableReasons.add(
+ ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
+ String.valueOf(className),
+ String.valueOf(config.dn()),
+ stackTraceToSingleLineString(e)));
return false;
}
@@ -481,10 +482,9 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_CONFIG_CONNHANDLER_CANNOT_INITIALIZE;
- unacceptableReasons.add(getMessage(msgID, String
- .valueOf(className), String.valueOf(config.dn()),
- stackTraceToSingleLineString(e)));
+ unacceptableReasons.add(ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
+ String.valueOf(className), String.valueOf(config.dn()),
+ stackTraceToSingleLineString(e)));
return false;
}
--
Gitblit v1.10.0