From 0f8c0db941311b7e34f0abc3299385175b9051cb Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 21 Feb 2014 15:33:02 +0000
Subject: [PATCH] Checkpoint for OPENDJ-1303 "opendj-cli" - replaced ToolConstants by ArgumentConstants. - deleted ToolConstants.

---
 opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
index 29fd356..9d99e8e 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -61,7 +61,6 @@
 import org.opends.server.admin.std.client.RootCfgClient;
 import org.opends.server.core.DirectoryServer;
 import org.opends.server.tools.ConfigureWindowsService;
-import org.opends.server.tools.ToolConstants;
 import org.opends.server.util.DynamicConstants;
 import org.opends.server.util.StaticUtils;
 
@@ -70,6 +69,7 @@
 import static org.opends.messages.QuickSetupMessages.*;
 import static org.opends.quicksetup.Step.*;
 import static org.opends.quicksetup.util.Utils.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
 
 import java.io.*;
 import java.net.InetAddress;
@@ -2073,8 +2073,8 @@
             ERR_UNINSTALL_ERROR_UPDATING_REMOTE_NO_FORCE.get(
               "--"+
               parser.getSecureArgsList().adminUidArg.getLongIdentifier(),
-              "--"+ToolConstants.OPTION_LONG_BINDPWD,
-              "--"+ToolConstants.OPTION_LONG_BINDPWD_FILE,
+              "--"+OPTION_LONG_BINDPWD,
+              "--"+OPTION_LONG_BINDPWD_FILE,
               "--"+parser.forceOnErrorArg.getLongIdentifier(),
               ae.getMessageObject());
           throw new ApplicationException(ae.getType(), msg, ae);

--
Gitblit v1.10.0