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/admin/client/cli/DsFrameworkCliMain.java | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java b/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java
index 5e87f55..0794fb8 100644
--- a/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java
+++ b/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.admin.client.cli;
+import org.opends.messages.Message;
import java.io.OutputStream;
import java.io.PrintStream;
@@ -37,9 +38,9 @@
import org.opends.server.util.args.ArgumentException;
import static org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.*;
-import static org.opends.server.messages.MessageHandler.*;
-import static org.opends.server.messages.AdminMessages.*;
-import static org.opends.server.messages.ToolMessages.*;
+import static org.opends.messages.AdminMessages.*;
+import static org.opends.messages.ToolMessages.*;
+import org.opends.messages.MessageBuilder;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -166,15 +167,14 @@
DsFrameworkCliParser argParser ;
try
{
- String toolDescription = getMessage(MSGID_ADMIN_TOOL_DESCRIPTION);
+ Message toolDescription = INFO_ADMIN_TOOL_DESCRIPTION.get();
argParser = new DsFrameworkCliParser(CLASS_NAME,
toolDescription, false);
argParser.initializeParser(out);
}
catch (ArgumentException ae)
{
- int msgID = MSGID_CANNOT_INITIALIZE_ARGS;
- String message = getMessage(msgID, ae.getMessage());
+ Message message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
return CANNOT_INITIALIZE_ARGS.getReturnCode();
@@ -187,8 +187,7 @@
}
catch (ArgumentException ae)
{
- int msgID = MSGID_ERROR_PARSING_ARGS;
- String message = getMessage(msgID, ae.getMessage());
+ Message message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
err.println(argParser.getUsage());
@@ -203,9 +202,8 @@
if (argParser.getSubCommand() == null)
{
- int msgID = MSGID_ERROR_PARSING_ARGS;
- String message = getMessage(msgID,
- getMessage(MSGID_DSCFG_ERROR_MISSING_SUBCOMMAND));
+ Message message = ERR_ERROR_PARSING_ARGS.get(
+ ERR_DSCFG_ERROR_MISSING_SUBCOMMAND.get());
err.println(wrapText(message, MAX_LINE_WIDTH));
err.println();
err.println(argParser.getHelpUsageReference());
@@ -265,30 +263,29 @@
}
catch (ArgumentException ae)
{
- int msgID = MSGID_CANNOT_INITIALIZE_ARGS;
- String message = getMessage(msgID, ae.getMessage());
+ Message message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
return CANNOT_INITIALIZE_ARGS.getReturnCode();
}
- int msgID = returnCode.getMessageId();
- String message = "" ;
+ Message msg = returnCode.getMessage();
if ( (returnCode == SUCCESSFUL)
||
(returnCode == SUCCESSFUL_NOP))
{
if (argParser.isVerbose())
{
- out.println(wrapText(getMessage(msgID), MAX_LINE_WIDTH));
+ out.println(wrapText(msg.toString(), MAX_LINE_WIDTH));
}
}
else
- if (msgID != MSGID_ADMIN_NO_MESSAGE)
+ if (msg != null &&
+ msg.getDescriptor().getId() != ERR_ADMIN_NO_MESSAGE.getId())
{
- message = getMessage(MSGID_ADMIN_ERROR);
- message = message + getMessage(msgID);
- err.println(wrapText(message, MAX_LINE_WIDTH));
+ MessageBuilder mb = new MessageBuilder(INFO_ADMIN_ERROR.get());
+ mb.append(msg);
+ err.println(wrapText(mb.toString(), MAX_LINE_WIDTH));
if (argParser.isVerbose() && (adsException != null))
{
adsException.printStackTrace();
--
Gitblit v1.10.0