From 7a6f3dd0c046db02a9cebddd7e635c2189e378ff Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Sat, 21 Jul 2012 20:43:37 +0000
Subject: [PATCH] Fix OPENDJ-522: Add capability to force the upgrade to complete if errors occur during non-interactive mode
---
opends/src/quicksetup/org/opends/quicksetup/ui/GuiUserInteraction.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/GuiUserInteraction.java b/opends/src/quicksetup/org/opends/quicksetup/ui/GuiUserInteraction.java
index 9c9d0f5..f1bb1dc 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/GuiUserInteraction.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/GuiUserInteraction.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions copyright 2012 ForgeRock AS.
*/
package org.opends.quicksetup.ui;
@@ -152,24 +153,28 @@
/**
* {@inheritDoc}
*/
- public String promptForString(Message prompt, Message title,
- String defaultValue) {
- Object o = JOptionPane.showInputDialog(
- parent, prompt.toString(), title.toString(),
- JOptionPane.QUESTION_MESSAGE,
- null, null, defaultValue);
- return o != null ? o.toString() : null;
+ public boolean isCLI()
+ {
+ return false;
}
/**
* {@inheritDoc}
*/
- public boolean isCLI()
+ public boolean isForceOnError()
{
return false;
}
/**
+ * {@inheritDoc}
+ */
+ public boolean isInteractive()
+ {
+ return true;
+ }
+
+ /**
* JOptionPane that controls the number of characters that are allowed
* to appear on a single line in the input area of the dialog.
*/
--
Gitblit v1.10.0