From cfc513043c5830b5a967733066068c7097b42e3c 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.
---
opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java | 110 ++++++++++++++++++++++++++----------------------------
1 files changed, 53 insertions(+), 57 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
index fb824cd..d910fb9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.extensions;
+import org.opends.messages.Message;
@@ -51,12 +52,11 @@
import org.opends.server.types.NamedCharacterSet;
import org.opends.server.types.ResultCode;
-import static org.opends.server.config.ConfigConstants.*;
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.ExtensionsMessages.*;
-import static org.opends.server.messages.MessageHandler.*;
+import static org.opends.messages.ExtensionMessages.*;
+
import static org.opends.server.util.StaticUtils.*;
@@ -127,19 +127,18 @@
if (encodedCharacterSets.size() == 0)
{
- msgID = MSGID_RANDOMPWGEN_NO_CHARSETS;
- String message = getMessage(msgID, String.valueOf(configEntryDN));
- throw new ConfigException(msgID, message);
+ Message message =
+ ERR_RANDOMPWGEN_NO_CHARSETS.get(String.valueOf(configEntryDN));
+ throw new ConfigException(message);
}
for (NamedCharacterSet s : NamedCharacterSet
.decodeCharacterSets(encodedCharacterSets))
{
if (charsets.containsKey(s.getName()))
{
- msgID = MSGID_RANDOMPWGEN_CHARSET_NAME_CONFLICT;
- String message = getMessage(msgID, String.valueOf(configEntryDN), s
- .getName());
- throw new ConfigException(msgID, message);
+ Message message = ERR_RANDOMPWGEN_CHARSET_NAME_CONFLICT.get(
+ String.valueOf(configEntryDN), s.getName());
+ throw new ConfigException(message);
}
else
{
@@ -158,9 +157,9 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- msgID = MSGID_RANDOMPWGEN_CANNOT_DETERMINE_CHARSETS;
- String message = getMessage(msgID, getExceptionMessage(e));
- throw new InitializationException(msgID, message, e);
+ Message message =
+ ERR_RANDOMPWGEN_CANNOT_DETERMINE_CHARSETS.get(getExceptionMessage(e));
+ throw new InitializationException(message, e);
}
@@ -188,10 +187,9 @@
NamedCharacterSet charset = charsets.get(name);
if (charset == null)
{
- msgID = MSGID_RANDOMPWGEN_UNKNOWN_CHARSET;
- String message = getMessage(msgID, String.valueOf(formatString),
- String.valueOf(name));
- throw new ConfigException(msgID, message);
+ Message message = ERR_RANDOMPWGEN_UNKNOWN_CHARSET.get(
+ String.valueOf(formatString), String.valueOf(name));
+ throw new ConfigException(message);
}
else
{
@@ -210,9 +208,9 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- msgID = MSGID_RANDOMPWGEN_INVALID_PWFORMAT;
- String message = getMessage(msgID, String.valueOf(formatString));
- throw new ConfigException(msgID, message, e);
+ Message message = ERR_RANDOMPWGEN_INVALID_PWFORMAT.get(
+ String.valueOf(formatString));
+ throw new ConfigException(message, e);
}
}
@@ -238,9 +236,9 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- msgID = MSGID_RANDOMPWGEN_CANNOT_DETERMINE_PWFORMAT;
- String message = getMessage(msgID, getExceptionMessage(e));
- throw new InitializationException(msgID, message, e);
+ Message message =
+ ERR_RANDOMPWGEN_CANNOT_DETERMINE_PWFORMAT.get(getExceptionMessage(e));
+ throw new InitializationException(message, e);
}
configuration.addRandomChangeListener(this) ;
@@ -301,7 +299,7 @@
*/
@Override()
public boolean isConfigurationAcceptable(PasswordGeneratorCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
RandomPasswordGeneratorCfg config =
(RandomPasswordGeneratorCfg) configuration;
@@ -315,7 +313,7 @@
*/
public boolean isConfigurationChangeAcceptable(
RandomPasswordGeneratorCfg configuration,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
int msgID;
@@ -331,9 +329,9 @@
SortedSet<String> currentPasSet = configuration.getPasswordCharacterSet();
if (currentPasSet.size() == 0)
{
- msgID = MSGID_RANDOMPWGEN_NO_CHARSETS;
- String message = getMessage(msgID, String.valueOf(cfgEntryDN));
- throw new ConfigException(msgID, message);
+ Message message =
+ ERR_RANDOMPWGEN_NO_CHARSETS.get(String.valueOf(cfgEntryDN));
+ throw new ConfigException(message);
}
for (NamedCharacterSet s : NamedCharacterSet
@@ -341,9 +339,8 @@
{
if (charsets.containsKey(s.getName()))
{
- msgID = MSGID_RANDOMPWGEN_CHARSET_NAME_CONFLICT;
- String message = getMessage(msgID, String.valueOf(cfgEntryDN), s
- .getName());
+ Message message = ERR_RANDOMPWGEN_CHARSET_NAME_CONFLICT.get(
+ String.valueOf(cfgEntryDN), s.getName());
unacceptableReasons.add(message);
return false;
}
@@ -355,7 +352,7 @@
}
catch (ConfigException ce)
{
- unacceptableReasons.add(ce.getMessage());
+ unacceptableReasons.add(ce.getMessageObject());
return false;
}
catch (Exception e)
@@ -365,8 +362,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- msgID = MSGID_RANDOMPWGEN_CANNOT_DETERMINE_CHARSETS;
- String message = getMessage(msgID, getExceptionMessage(e));
+ Message message = ERR_RANDOMPWGEN_CANNOT_DETERMINE_CHARSETS.get(
+ getExceptionMessage(e));
unacceptableReasons.add(message);
return false;
}
@@ -392,9 +389,8 @@
NamedCharacterSet charset = charsets.get(name);
if (charset == null)
{
- msgID = MSGID_RANDOMPWGEN_UNKNOWN_CHARSET;
- String message = getMessage(msgID, String.valueOf(formatString),
- String.valueOf(name));
+ Message message = ERR_RANDOMPWGEN_UNKNOWN_CHARSET.get(
+ String.valueOf(formatString), String.valueOf(name));
unacceptableReasons.add(message);
return false;
}
@@ -406,8 +402,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- msgID = MSGID_RANDOMPWGEN_INVALID_PWFORMAT;
- String message = getMessage(msgID, String.valueOf(formatString));
+ Message message = ERR_RANDOMPWGEN_INVALID_PWFORMAT.get(
+ String.valueOf(formatString));
unacceptableReasons.add(message);
return false;
}
@@ -420,8 +416,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- msgID = MSGID_RANDOMPWGEN_CANNOT_DETERMINE_PWFORMAT;
- String message = getMessage(msgID, getExceptionMessage(e));
+ Message message = ERR_RANDOMPWGEN_CANNOT_DETERMINE_PWFORMAT.get(
+ getExceptionMessage(e));
unacceptableReasons.add(message);
return false;
}
@@ -441,7 +437,7 @@
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
int msgID;
@@ -455,8 +451,8 @@
newEncodedCharacterSets = configuration.getPasswordCharacterSet();
if (newEncodedCharacterSets.size() == 0)
{
- msgID = MSGID_RANDOMPWGEN_NO_CHARSETS;
- messages.add(getMessage(msgID, String.valueOf(configEntryDN)));
+ messages.add(ERR_RANDOMPWGEN_NO_CHARSETS.get(
+ String.valueOf(configEntryDN)));
if (resultCode == ResultCode.SUCCESS)
{
@@ -470,9 +466,9 @@
{
if (charsets.containsKey(s.getName()))
{
- msgID = MSGID_RANDOMPWGEN_CHARSET_NAME_CONFLICT;
- messages.add(getMessage(msgID, String.valueOf(configEntryDN),
- s.getName()));
+ messages.add(ERR_RANDOMPWGEN_CHARSET_NAME_CONFLICT.get(
+ String.valueOf(configEntryDN),
+ s.getName()));
if (resultCode == ResultCode.SUCCESS)
{
@@ -488,7 +484,7 @@
}
catch (ConfigException ce)
{
- messages.add(ce.getMessage());
+ messages.add(ce.getMessageObject());
if (resultCode == ResultCode.SUCCESS)
{
@@ -502,8 +498,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- msgID = MSGID_RANDOMPWGEN_CANNOT_DETERMINE_CHARSETS;
- messages.add(getMessage(msgID, getExceptionMessage(e)));
+ messages.add(ERR_RANDOMPWGEN_CANNOT_DETERMINE_CHARSETS.get(
+ getExceptionMessage(e)));
if (resultCode == ResultCode.SUCCESS)
{
@@ -537,9 +533,9 @@
NamedCharacterSet charset = charsets.get(name);
if (charset == null)
{
- msgID = MSGID_RANDOMPWGEN_UNKNOWN_CHARSET;
- messages.add(getMessage(msgID, String.valueOf(newFormatString),
- String.valueOf(name)));
+ messages.add(ERR_RANDOMPWGEN_UNKNOWN_CHARSET.get(
+ String.valueOf(newFormatString),
+ String.valueOf(name)));
if (resultCode == ResultCode.SUCCESS)
{
@@ -559,8 +555,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- msgID = MSGID_RANDOMPWGEN_INVALID_PWFORMAT;
- messages.add(getMessage(msgID, String.valueOf(newFormatString)));
+ messages.add(ERR_RANDOMPWGEN_INVALID_PWFORMAT.get(
+ String.valueOf(newFormatString)));
if (resultCode == ResultCode.SUCCESS)
{
@@ -576,8 +572,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- msgID = MSGID_RANDOMPWGEN_CANNOT_DETERMINE_PWFORMAT;
- messages.add(getMessage(msgID, getExceptionMessage(e)));
+ messages.add(ERR_RANDOMPWGEN_CANNOT_DETERMINE_PWFORMAT.get(
+ getExceptionMessage(e)));
if (resultCode == ResultCode.SUCCESS)
{
--
Gitblit v1.10.0