From 66ad41503e32e26e11405b497a9592d98e2d05a0 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 29 Aug 2007 17:54:56 +0000
Subject: [PATCH] Move the no option constant definition to ToolConstants. Refactor some code and put it in CliApplicationHelper. Fix some minor bugs in the output of the command-lines.
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
index b9afe53..6e4aad4 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
@@ -39,7 +39,6 @@
import org.opends.quicksetup.QuickSetupLog;
import org.opends.quicksetup.util.Utils;
-import org.opends.server.admin.client.cli.SecureConnectionCliParser;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.args.ArgumentParser;
import org.opends.server.util.args.BooleanArgument;
@@ -191,15 +190,15 @@
null, null, INFO_UPGRADE_DESCRIPTION_FILE.get());
argParser.addArgument(file);
noPrompt = new BooleanArgument(
- SecureConnectionCliParser.NO_PROMPT_OPTION_LONG,
- SecureConnectionCliParser.NO_PROMPT_OPTION_SHORT,
- SecureConnectionCliParser.NO_PROMPT_OPTION_LONG,
+ OPTION_LONG_NO_PROMPT,
+ OPTION_SHORT_NO_PROMPT,
+ OPTION_LONG_NO_PROMPT,
INFO_UPGRADE_DESCRIPTION_NO_PROMPT.get());
argParser.addArgument(noPrompt);
quiet = new BooleanArgument(
- SecureConnectionCliParser.QUIET_OPTION_LONG,
- SecureConnectionCliParser.QUIET_OPTION_SHORT,
- SecureConnectionCliParser.QUIET_OPTION_LONG,
+ OPTION_LONG_QUIET,
+ OPTION_SHORT_QUIET,
+ OPTION_LONG_QUIET,
INFO_UPGRADE_DESCRIPTION_SILENT.get());
argParser.addArgument(quiet);
showUsage = new BooleanArgument("showusage", OPTION_SHORT_HELP,
--
Gitblit v1.10.0