From 6df0f6e8fbf553f53e3e558cc108c8ff42dfa48f Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 09 Aug 2007 08:09:41 +0000
Subject: [PATCH] Fix for issue 1857 (Uninstall silent option works as interactive option).

---
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
index 11084c6..ee3a6f4 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
@@ -30,6 +30,7 @@
 import static org.opends.server.messages.ToolMessages.*;
 import static org.opends.server.tools.ToolConstants.*;
 
+import org.opends.quicksetup.CliApplicationHelper;
 import org.opends.quicksetup.Launcher;
 import org.opends.quicksetup.CliApplication;
 import org.opends.quicksetup.Installation;
@@ -186,10 +187,16 @@
               "{file}",
               null, null, MSGID_UPGRADE_DESCRIPTION_FILE);
       argParser.addArgument(file);
-      interactive = new BooleanArgument("interactive", 'i', "interactive",
+      interactive = new BooleanArgument(
+          CliApplicationHelper.INTERACTIVE_OPTION_LONG,
+          CliApplicationHelper.INTERACTIVE_OPTION_SHORT,
+          CliApplicationHelper.INTERACTIVE_OPTION_LONG,
           MSGID_UPGRADE_DESCRIPTION_INTERACTIVE);
       argParser.addArgument(interactive);
-      silent = new BooleanArgument("silent", 's', "silent",
+      silent = new BooleanArgument(
+          CliApplicationHelper.SILENT_OPTION_LONG,
+          CliApplicationHelper.SILENT_OPTION_SHORT,
+          CliApplicationHelper.SILENT_OPTION_LONG,
           MSGID_UPGRADE_DESCRIPTION_SILENT);
       argParser.addArgument(silent);
       showUsage = new BooleanArgument("showusage", OPTION_SHORT_HELP,

--
Gitblit v1.10.0