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/AlertHandlerConfigManager.java | 64 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/AlertHandlerConfigManager.java b/opends/src/server/org/opends/server/core/AlertHandlerConfigManager.java
index 678f020..4479545 100644
--- a/opends/src/server/org/opends/server/core/AlertHandlerConfigManager.java
+++ b/opends/src/server/org/opends/server/core/AlertHandlerConfigManager.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.core;
+import org.opends.messages.Message;
@@ -46,16 +47,15 @@
import org.opends.server.config.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-import org.opends.server.types.ErrorLogCategory;
-import org.opends.server.types.ErrorLogSeverity;
+
+
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
-import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.messages.ConfigMessages.*;
-import static org.opends.server.messages.MessageHandler.*;
-import static org.opends.server.util.StaticUtils.*;
+import static org.opends.messages.ConfigMessages.*;
+import static org.opends.server.util.StaticUtils.*;
+import org.opends.server.loggers.ErrorLogger;
/**
@@ -129,9 +129,7 @@
}
catch (InitializationException ie)
{
- logError(ErrorLogCategory.CONFIGURATION,
- ErrorLogSeverity.SEVERE_ERROR,
- ie.getMessage(), ie.getMessageID());
+ ErrorLogger.logError(ie.getMessageObject());
continue;
}
}
@@ -144,7 +142,7 @@
* {@inheritDoc}
*/
public boolean isConfigurationAddAcceptable(AlertHandlerCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
if (configuration.isEnabled())
{
@@ -157,7 +155,7 @@
}
catch (InitializationException ie)
{
- unacceptableReasons.add(ie.getMessage());
+ unacceptableReasons.add(ie.getMessageObject());
return false;
}
}
@@ -173,9 +171,9 @@
*/
public ConfigChangeResult applyConfigurationAdd(AlertHandlerCfg 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>();
configuration.addChangeListener(this);
@@ -200,7 +198,7 @@
resultCode = DirectoryServer.getServerErrorResultCode();
}
- messages.add(ie.getMessage());
+ messages.add(ie.getMessageObject());
}
if (resultCode == ResultCode.SUCCESS)
@@ -219,7 +217,7 @@
*/
public boolean isConfigurationDeleteAcceptable(
AlertHandlerCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
// FIXME -- We should try to perform some check to determine whether the
// alert handler is in use.
@@ -234,9 +232,9 @@
public ConfigChangeResult applyConfigurationDelete(
AlertHandlerCfg 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>();
AlertHandler alertHandler = alertHandlers.remove(configuration.dn());
if (alertHandler != null)
@@ -254,7 +252,7 @@
* {@inheritDoc}
*/
public boolean isConfigurationChangeAcceptable(AlertHandlerCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
if (configuration.isEnabled())
{
@@ -267,7 +265,7 @@
}
catch (InitializationException ie)
{
- unacceptableReasons.add(ie.getMessage());
+ unacceptableReasons.add(ie.getMessageObject());
return false;
}
}
@@ -286,7 +284,7 @@
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
// Get the existing alert handler if it's already enabled.
@@ -340,7 +338,7 @@
resultCode = DirectoryServer.getServerErrorResultCode();
}
- messages.add(ie.getMessage());
+ messages.add(ie.getMessageObject());
}
if (resultCode == ResultCode.SUCCESS)
@@ -397,7 +395,7 @@
handler.getClass().getMethod("isConfigurationAcceptable",
AlertHandlerCfg.class, List.class);
- List<String> unacceptableReasons = new ArrayList<String>();
+ List<Message> unacceptableReasons = new ArrayList<Message>();
Boolean acceptable = (Boolean) method.invoke(handler, configuration,
unacceptableReasons);
if (! acceptable)
@@ -405,7 +403,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())
{
@@ -414,10 +412,9 @@
}
}
- int msgID = MSGID_CONFIG_ALERTHANDLER_CONFIG_NOT_ACCEPTABLE;
- String message = getMessage(msgID, String.valueOf(configuration.dn()),
- buffer.toString());
- throw new InitializationException(msgID, message);
+ Message message = ERR_CONFIG_ALERTHANDLER_CONFIG_NOT_ACCEPTABLE.get(
+ String.valueOf(configuration.dn()), buffer.toString());
+ throw new InitializationException(message);
}
}
@@ -425,11 +422,10 @@
}
catch (Exception e)
{
- int msgID = MSGID_CONFIG_ALERTHANDLER_INITIALIZATION_FAILED;
- String message = getMessage(msgID, className,
- String.valueOf(configuration.dn()),
- stackTraceToSingleLineString(e));
- throw new InitializationException(msgID, message, e);
+ Message message = ERR_CONFIG_ALERTHANDLER_INITIALIZATION_FAILED.
+ get(className, String.valueOf(configuration.dn()),
+ stackTraceToSingleLineString(e));
+ throw new InitializationException(message, e);
}
}
}
--
Gitblit v1.10.0