From 81d36161ce5367fa7aa9a5d99dc8b80eacfa7cdf Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 24 Jan 2014 14:43:46 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java
index 7ebe21d..5f25b17 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java
@@ -22,10 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.admin.client.cli;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import java.io.OutputStream;
import java.io.PrintStream;
@@ -36,6 +36,7 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.NullOutputStream;
import org.opends.server.util.BuildVersion;
+import org.opends.server.util.StaticUtils;
import org.opends.server.util.args.ArgumentException;
import static org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.*;
@@ -43,7 +44,8 @@
import static org.opends.messages.DSConfigMessages.*;
import static org.opends.messages.ToolMessages.*;
-import org.opends.messages.MessageBuilder;
+import org.forgerock.i18n.LocalizableMessageBuilder;
+
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -153,14 +155,14 @@
DsFrameworkCliParser argParser ;
try
{
- Message toolDescription = INFO_ADMIN_TOOL_DESCRIPTION.get();
+ LocalizableMessage toolDescription = INFO_ADMIN_TOOL_DESCRIPTION.get();
argParser = new DsFrameworkCliParser(CLASS_NAME,
toolDescription, false);
argParser.initializeParser(out);
}
catch (ArgumentException ae)
{
- Message message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
+ LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
return CANNOT_INITIALIZE_ARGS.getReturnCode();
@@ -173,7 +175,7 @@
}
catch (ArgumentException ae)
{
- Message message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
+ LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
err.println(argParser.getUsage());
@@ -199,7 +201,7 @@
if (argParser.getSubCommand() == null)
{
- Message message = ERR_ERROR_PARSING_ARGS.get(
+ LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(
ERR_DSCFG_ERROR_MISSING_SUBCOMMAND.get());
err.println(wrapText(message, MAX_LINE_WIDTH));
err.println();
@@ -260,13 +262,13 @@
}
catch (ArgumentException ae)
{
- Message message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
+ LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
err.println(wrapText(message, MAX_LINE_WIDTH));
return CANNOT_INITIALIZE_ARGS.getReturnCode();
}
- Message msg = returnCode.getMessage();
+ LocalizableMessage msg = returnCode.getMessage();
if ( (returnCode == SUCCESSFUL)
||
(returnCode == SUCCESSFUL_NOP))
@@ -277,10 +279,9 @@
}
}
else
- if (msg != null &&
- msg.getDescriptor().getId() != ERR_ADMIN_NO_MESSAGE.getId())
+ if (msg != null && StaticUtils.hasDescriptor(msg, ERR_ADMIN_NO_MESSAGE))
{
- MessageBuilder mb = new MessageBuilder(INFO_ADMIN_ERROR.get());
+ LocalizableMessageBuilder mb = new LocalizableMessageBuilder(INFO_ADMIN_ERROR.get());
mb.append(msg);
err.println(wrapText(mb.toString(), MAX_LINE_WIDTH));
if (argParser.isVerbose() && (adsException != null))
--
Gitblit v1.10.0