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/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
index 57fdc38..5210225 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011 ForgeRock AS
+ *      Portions Copyright 2011-2014 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel;
@@ -33,7 +33,7 @@
 import java.util.LinkedHashSet;
 
 import org.opends.admin.ads.util.ConnectionUtils;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
 import org.opends.quicksetup.Constants;
 import org.opends.quicksetup.UserData;
 import org.opends.quicksetup.util.Utils;
@@ -99,7 +99,7 @@
    * @param msg the usage message.
    */
   public ControlPanelArgumentParser(String mainClassName,
-      Message msg)
+      LocalizableMessage msg)
   {
     super(mainClassName, msg, false);
   }
@@ -197,7 +197,7 @@
   @Override()
   public void parseArguments(String[] args) throws ArgumentException
   {
-    LinkedHashSet<Message> errorMessages = new LinkedHashSet<Message>();
+    LinkedHashSet<LocalizableMessage> errorMessages = new LinkedHashSet<LocalizableMessage>();
     try
     {
       super.parseArguments(args);
@@ -209,7 +209,7 @@
 
     if (bindPasswordArg.isPresent() && bindPasswordFileArg.isPresent())
     {
-      Message message = ERR_TOOL_CONFLICTING_ARGS.get(
+      LocalizableMessage message = ERR_TOOL_CONFLICTING_ARGS.get(
           bindPasswordArg.getLongIdentifier(),
           bindPasswordFileArg.getLongIdentifier());
       errorMessages.add(message);
@@ -217,7 +217,7 @@
 
     if (errorMessages.size() > 0)
     {
-      Message message = ERR_CANNOT_INITIALIZE_ARGS.get(
+      LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(
           Utils.getMessageFromCollection(errorMessages,
               Constants.LINE_SEPARATOR));
       throw new ArgumentException(message);

--
Gitblit v1.10.0