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/installer/Installer.java | 30 +++++++++---------------------
1 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 0869d69..34b3097 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -152,6 +152,13 @@
/**
* {@inheritDoc}
*/
+ public boolean isCancellable() {
+ return false; // TODO: have installer delete installed files upon cancel
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public UserData createUserData() {
UserData ud = new UserData();
ud.setServerLocation(Utils.getDefaultServerLocation());
@@ -198,20 +205,6 @@
/**
* {@inheritDoc}
*/
- public boolean canClose(WizardStep step) {
- return step == PROGRESS;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean canCancel(WizardStep step) {
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
public boolean isSubStep(WizardStep step)
{
return SUBSTEPS.contains(step);
@@ -321,8 +314,8 @@
/**
* {@inheritDoc}
*/
- public void cancelClicked(WizardStep cStep, QuickSetup qs) {
- // do nothing;
+ public void cancel() {
+ // do nothing; not cancellable
}
/**
@@ -489,16 +482,11 @@
if (step == REVIEW) {
dlg.setFocusOnButton(ButtonName.FINISH);
dlg.setDefaultButton(ButtonName.FINISH);
- } else if (step == PROGRESS) {
- dlg.setDefaultButton(ButtonName.CLOSE);
} else if (step == WELCOME) {
dlg.setDefaultButton(ButtonName.NEXT);
dlg.setFocusOnButton(ButtonName.NEXT);
} else if (step == REVIEW) {
dlg.setDefaultButton(ButtonName.NEXT);
- } else if (step == PROGRESS) {
- dlg.setFocusOnButton(ButtonName.CLOSE);
- dlg.setButtonEnabled(ButtonName.CLOSE, false);
} else {
dlg.setDefaultButton(ButtonName.NEXT);
}
--
Gitblit v1.10.0