From d00c43b28a6cac711412231562b74e135255d3de Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 12 Jul 2007 14:41:36 +0000
Subject: [PATCH] This commit addresses issue 1851 "upgrader does not handle new config entries also present in current configuration". This issue is somewhat of a corner case but this code will allow a user to better deal with problems that might arise migrating the configuration or schema of a server.
---
opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java b/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java
index 57a3bf5..c467196 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java
@@ -307,7 +307,7 @@
* step from <code>step</code>
*/
public boolean canGoForward(WizardStep step) {
- return getNextWizardStep(step) != null;
+ return !step.isProgressStep() && getNextWizardStep(step) != null;
}
/**
@@ -595,7 +595,7 @@
/**
* {@inheritDoc}
*/
- protected UserInteraction userInteraction() {
+ public UserInteraction userInteraction() {
UserInteraction ui = null;
if (!getUserData().isSilent()) {
if (Utils.isCli()) {
--
Gitblit v1.10.0