From f6bff1e8c31ae6ebfabfdb478771216b9773a3c4 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 24 May 2007 00:37:30 +0000
Subject: [PATCH] This commit addresses issue 1599 as well as introduces some other changes suggested by Brian after reviewing the SWAED guidelines:
---
opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java b/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
index 410ad11..6f40872 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
@@ -85,22 +85,26 @@
private GuiApplication application;
+ private QuickSetup quickSetup;
+
private boolean forceToDisplay;
/**
* Constructor of QuickSetupDialog.
* @param app Application to run in as a wizard
* @param installStatus of the current environment
+ * @param qs QuickSetup acting as controller
*/
public QuickSetupDialog(GuiApplication app,
- CurrentInstallStatus installStatus)
+ CurrentInstallStatus installStatus,
+ QuickSetup qs)
{
if (app == null) {
throw new IllegalArgumentException("application cannot be null");
}
this.application = app;
this.installStatus = installStatus;
-
+ this.quickSetup = qs;
frame = new JFrame(application.getFrameTitle());
frame.getContentPane().add(getFramePanel());
frame.addWindowListener(new WindowAdapter() {
@@ -176,7 +180,7 @@
{
displayedStep = step;
// First call the panels to do the required updates on their layout
- getButtonsPanel().setDisplayedStep(step);
+ getButtonsPanel().updateButtons(step);
getStepsPanel().setDisplayedStep(step, userData);
getCurrentStepPanel().setDisplayedStep(step, userData);
}
@@ -393,6 +397,7 @@
if (stepsPanel == null)
{
stepsPanel = new StepsPanel(application);
+ stepsPanel.setQuickSetup(quickSetup);
}
return stepsPanel;
}
@@ -405,7 +410,7 @@
{
if (currentStepPanel == null)
{
- currentStepPanel = new CurrentStepPanel(application);
+ currentStepPanel = new CurrentStepPanel(application, quickSetup);
}
return currentStepPanel;
}
@@ -420,6 +425,7 @@
if (buttonsPanel == null)
{
buttonsPanel = new ButtonsPanel(application);
+ buttonsPanel.setQuickSetup(quickSetup);
}
return buttonsPanel;
}
@@ -519,6 +525,7 @@
installedPanel = new QuickSetupErrorPanel(
application,
installStatus);
+ installedPanel.setQuickSetup(quickSetup);
}
return installedPanel;
}
--
Gitblit v1.10.0