From e75584b1354e33c7c373ea13521d29bb5ac433d7 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 26 Mar 2008 17:23:37 +0000
Subject: [PATCH] Fix for issues 3086 and 3087 (Command uninstall --cli should not uninstall when the user have not answer "yes")
---
opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
index f0d94c4..f10cad0 100644
--- a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -43,6 +43,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
+import static org.opends.messages.UtilityMessages.*;
import org.opends.quicksetup.*;
import org.opends.quicksetup.event.ProgressUpdateEvent;
@@ -255,7 +256,6 @@
println();
}
-
return userData;
}
@@ -297,6 +297,8 @@
builder.setDefault(Message.raw(String.valueOf(REMOVE_ALL)),
MenuResult.success(REMOVE_ALL));
+ builder.setMaxTries(CONFIRMATION_MAX_TRIES);
+
Menu<Integer> menu = builder.toMenu();
int choice;
try
@@ -320,7 +322,12 @@
catch (CLIException ce)
{
choice = REMOVE_ALL;
+ cancelled = true;
LOG.log(Level.WARNING, "Error reading input: "+ce, ce);
+ if (ce.getMessageObject().getDescriptor().equals(ERR_TRIES_LIMIT_REACHED))
+ {
+ println(ce.getMessageObject());
+ }
}
if (cancelled)
@@ -634,7 +641,7 @@
{
println(ce.getMessageObject());
println();
- cancelled = false;
+ cancelled = true;
}
}
else
--
Gitblit v1.10.0