From 5b9b245bdc60b0e78bfd8893c2ef48def42eccc0 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).

---
 opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
index 3ad72c0..04318a3 100644
--- a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
+++ b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
@@ -35,6 +35,7 @@
 
 import org.opends.guitools.i18n.ResourceProvider;
 import org.opends.quicksetup.CliApplication;
+import org.opends.quicksetup.CliApplicationHelper;
 import org.opends.quicksetup.Launcher;
 import org.opends.quicksetup.Installation;
 import org.opends.quicksetup.QuickSetupLog;
@@ -102,13 +103,23 @@
         getI18n().getMsg("uninstall-launcher-usage-description"), false);
     BooleanArgument cli;
     BooleanArgument silent;
+    BooleanArgument interactive;
     BooleanArgument showUsage;
     try
     {
       cli = new BooleanArgument("cli", 'c', "cli",
           MSGID_UNINSTALLDS_DESCRIPTION_CLI);
       argParser.addArgument(cli);
-      silent = new BooleanArgument("silent", 's', "silent",
+      interactive = new BooleanArgument(
+          CliApplicationHelper.INTERACTIVE_OPTION_LONG,
+          CliApplicationHelper.INTERACTIVE_OPTION_SHORT,
+          CliApplicationHelper.INTERACTIVE_OPTION_LONG,
+          MSGID_DESCRIPTION_INTERACTIVE);
+      argParser.addArgument(interactive);
+      silent = new BooleanArgument(
+          CliApplicationHelper.SILENT_OPTION_LONG,
+          CliApplicationHelper.SILENT_OPTION_SHORT,
+          CliApplicationHelper.SILENT_OPTION_LONG,
           MSGID_UNINSTALLDS_DESCRIPTION_SILENT);
       argParser.addArgument(silent);
       showUsage = new BooleanArgument("showusage", OPTION_SHORT_HELP,

--
Gitblit v1.10.0