From 90288dc278771356aa6dfa3832cb4a4bb19e9fab Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 04 Jul 2007 16:48:57 +0000
Subject: [PATCH] This commit's design changes have been reviewed and approved by Brian Ehret.
---
opends/src/quicksetup/org/opends/quicksetup/ui/ButtonsPanel.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/ButtonsPanel.java b/opends/src/quicksetup/org/opends/quicksetup/ui/ButtonsPanel.java
index dd57fc9..dd0b8bc 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/ButtonsPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/ButtonsPanel.java
@@ -29,11 +29,8 @@
import org.opends.quicksetup.ButtonName;
import org.opends.quicksetup.WizardStep;
-import org.opends.quicksetup.upgrader.Upgrader;
import org.opends.quicksetup.event.ButtonActionListener;
import org.opends.quicksetup.event.ButtonEvent;
-import org.opends.quicksetup.installer.Installer;
-import org.opends.quicksetup.uninstaller.Uninstaller;
import javax.swing.*;
import java.awt.*;
@@ -115,11 +112,11 @@
// The quit button appears on all the panels leading up
// to the progress panel
- quitButton.setVisible(!step.isProgressStep());
+ quitButton.setVisible(!step.isProgressStep() && !step.isFinishedStep());
// The close button is only used on the progress panel and
// is only enabled once progress has finished or cancelled.
- closeButton.setVisible(step.isProgressStep());
+ closeButton.setVisible(step.isProgressStep() || step.isFinishedStep());
closeButton.setEnabled(application.getCurrentProgressStep().isLast());
}
@@ -227,9 +224,7 @@
nextFinishPanel.setOpaque(false);
nextFinishPanel.add(nextButton, gbcAux);
- // TODO: remove this hack
- if (getApplication() instanceof Installer ||
- getApplication() instanceof Upgrader) {
+ if (getApplication().finishOnLeft()) {
nextFinishPanel.add(finishButton, gbcAux);
}
width =
@@ -249,8 +244,7 @@
gbc.fill = GridBagConstraints.NONE;
gbc.insets.left = UIFactory.HORIZONTAL_INSET_BETWEEN_BUTTONS;
- // TODO: remove this hack
- if (getApplication() instanceof Uninstaller) {
+ if (!getApplication().finishOnLeft()) {
gbc.insets.right = UIFactory.HORIZONTAL_INSET_BETWEEN_BUTTONS;
add(finishButton, gbc);
gbc.insets.right = 0;
--
Gitblit v1.10.0