From 5d0ceeba98f7bfd2cf17a1f2970e4c8be3130388 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Sun, 26 Aug 2007 17:43:55 +0000
Subject: [PATCH] Fix for issues 2104 and 2162.
---
opends/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
index 04fd1b9..8d0e507 100644
--- a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
+++ b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
@@ -52,7 +52,7 @@
*/
public class UninstallerArgumentParser extends SecureConnectionCliParser
{
- private BooleanArgument interactive;
+ private BooleanArgument noPrompt;
private BooleanArgument forceOnError;
private BooleanArgument quiet;
private BooleanArgument removeAll;
@@ -151,17 +151,17 @@
INFO_UNINSTALLDS_DESCRIPTION_REMOVE_LDIF_FILES.get()
);
args.add(removeLDIFFiles);
- interactive = new BooleanArgument(
- INTERACTIVE_OPTION_LONG,
- INTERACTIVE_OPTION_SHORT,
- INTERACTIVE_OPTION_LONG,
- INFO_DESCRIPTION_INTERACTIVE.get());
- args.add(interactive);
+ noPrompt = new BooleanArgument(
+ NO_PROMPT_OPTION_LONG,
+ NO_PROMPT_OPTION_SHORT,
+ NO_PROMPT_OPTION_LONG,
+ INFO_DESCRIPTION_NO_PROMPT.get());
+ args.add(noPrompt);
forceOnError = new BooleanArgument(
"forceOnError",
'f',
"forceOnError",
- INFO_UNINSTALLDS_DESCRIPTION_FORCE.get());
+ INFO_UNINSTALLDS_DESCRIPTION_FORCE.get(noPrompt.getLongIdentifier()));
args.add(forceOnError);
quiet = new BooleanArgument(
SecureConnectionCliParser.QUIET_OPTION_LONG,
@@ -209,7 +209,7 @@
*/
public boolean isInteractive()
{
- return interactive.isPresent();
+ return !noPrompt.isPresent();
}
/**
@@ -370,11 +370,10 @@
public int validateGlobalOptions(MessageBuilder buf)
{
int returnValue;
- if (interactive.isPresent() && forceOnError.isPresent())
+ if (!noPrompt.isPresent() && forceOnError.isPresent())
{
- Message message = ERR_TOOL_CONFLICTING_ARGS.get(
- interactive.getLongIdentifier(),
- forceOnError.getLongIdentifier());
+ Message message = ERR_UNINSTALL_FORCE_REQUIRES_NO_PROMPT.get(
+ forceOnError.getLongIdentifier(), noPrompt.getLongIdentifier());
if (buf.length() > 0)
{
buf.append(EOL);
--
Gitblit v1.10.0