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/UninstallCliHelper.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
index 2cda6cd..971063a 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -60,7 +60,6 @@
import org.opends.quicksetup.util.Utils;
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
-import org.opends.server.tools.ToolConstants;
import org.opends.server.tools.dsconfig.LDAPManagementContextFactory;
import org.opends.server.util.StaticUtils;
@@ -78,6 +77,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
import static com.forgerock.opendj.cli.Utils.CONFIRMATION_MAX_TRIES;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
/**
* The class used to provide some CLI interface in the uninstall.
@@ -1300,8 +1300,8 @@
println();
printErrorMessage(ERR_UNINSTALL_ERROR_UPDATING_REMOTE_FORCE.get(
"--"+parser.getSecureArgsList().adminUidArg.getLongIdentifier(),
- "--"+ToolConstants.OPTION_LONG_BINDPWD,
- "--"+ToolConstants.OPTION_LONG_BINDPWD_FILE,
+ "--"+OPTION_LONG_BINDPWD,
+ "--"+OPTION_LONG_BINDPWD_FILE,
exceptionMsg));
}
else
@@ -1311,8 +1311,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(),
exceptionMsg));
}
@@ -1472,8 +1472,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(),
Utils.getMessageFromCollection(exceptionMsgs,
Constants.LINE_SEPARATOR));
--
Gitblit v1.10.0