From 81909cf43111e8499c583395b66e96b6b74e6ab9 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 21 Feb 2014 13:50:22 +0000
Subject: [PATCH] Checkpoint OPENDJ-1343 Migrate dsconfig / OPENDJ-1303 "opendj-cli" - replaced arguments by CLI sdk CommonArguments.(Basic only, riskless to conflicting arguments) - reverted modifications on InstallDS/InstallDSArgumentParser about getDirectoryManagerPassword. - removed from toolconstants 'description' / 'memberName' (unused)
---
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
index b5053a3..a418c17 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
@@ -42,6 +42,7 @@
import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.StringArgument;
import static org.opends.messages.AdminToolMessages.*;
@@ -104,12 +105,9 @@
throws ArgumentException
{
LinkedHashSet<Argument> args = new LinkedHashSet<Argument>();
- cliArg = new BooleanArgument(
- OPTION_LONG_CLI,
- OPTION_SHORT_CLI,
- OPTION_LONG_CLI,
- INFO_UNINSTALLDS_DESCRIPTION_CLI.get());
+ cliArg = CommonArguments.getCLI();
args.add(cliArg);
+
removeAllArg = new BooleanArgument(
"remove-all",
'a',
@@ -159,12 +157,10 @@
INFO_UNINSTALLDS_DESCRIPTION_REMOVE_LDIF_FILES.get()
);
args.add(removeLDIFFilesArg);
- noPromptArg = new BooleanArgument(
- OPTION_LONG_NO_PROMPT,
- OPTION_SHORT_NO_PROMPT,
- OPTION_LONG_NO_PROMPT,
- INFO_DESCRIPTION_NO_PROMPT.get());
+
+ noPromptArg = CommonArguments.getNoPrompt();
args.add(noPromptArg);
+
forceOnErrorArg = new BooleanArgument(
"forceOnError",
'f',
@@ -172,11 +168,8 @@
INFO_UNINSTALLDS_DESCRIPTION_FORCE.get(
"--"+noPromptArg.getLongIdentifier()));
args.add(forceOnErrorArg);
- quietArg = new BooleanArgument(
- OPTION_LONG_QUIET,
- OPTION_SHORT_QUIET,
- OPTION_LONG_QUIET,
- INFO_UNINSTALLDS_DESCRIPTION_QUIET.get());
+
+ quietArg = CommonArguments.getQuiet();
args.add(quietArg);
for (Argument arg : args)
--
Gitblit v1.10.0