From 613e2b4c5fb2eb2f443d4902cb98b69e8431cc19 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 03 Apr 2007 15:08:42 +0000
Subject: [PATCH] Fix some regressions introduced with the QuickSetup code refactorization:
---
opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java | 1 +
opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java | 3 ++-
opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 15 ++++++---------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java b/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java
index 8533d80..32807c0 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java
@@ -527,7 +527,8 @@
throw new NullPointerException("step is null");
}
currentStep = step;
- getDialog().setDisplayedStep(step, application.getUserData());
+ application.setDisplayedWizardStep(step, application.getUserData(),
+ getDialog());
}
/**
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 47b6a25..b6e5708 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -344,18 +344,15 @@
// Set the default button for the frame
if (step == REVIEW) {
- dlg.setDefaultButton(ButtonName.FINISH);
- dlg.setFocusOnButton(ButtonName.FINISH);
+ dlg.setFocusOnButton(ButtonName.FINISH);
+ dlg.setDefaultButton(ButtonName.FINISH);
} else if (step == PROGRESS) {
- dlg.setDefaultButton(ButtonName.CLOSE);
+ dlg.setDefaultButton(ButtonName.CLOSE);
} else if (step == WELCOME) {
- dlg.setFocusOnButton(ButtonName.NEXT);
- } else if (step == SERVER_SETTINGS) {
- // The focus is set by the panel itself
- } else if (step == DATA_OPTIONS) {
- // The focus is set by the panel itself
+ dlg.setDefaultButton(ButtonName.NEXT);
+ dlg.setFocusOnButton(ButtonName.NEXT);
} else if (step == REVIEW) {
- // do nothing?
+ dlg.setDefaultButton(ButtonName.NEXT);
} else if (step == PROGRESS) {
dlg.setFocusOnButton(ButtonName.CLOSE);
dlg.setButtonEnabled(ButtonName.CLOSE, false);
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java b/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
index 206c35d..0b86796 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
@@ -143,6 +143,7 @@
public void forceToDisplay()
{
this.forceToDisplay = true;
+ framePanel = null;
frame.getContentPane().removeAll();
frame.getContentPane().add(getFramePanel());
frame.pack();
--
Gitblit v1.10.0