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/uninstaller/Uninstaller.java | 40 ++++++++++++++--------------------------
1 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java b/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
index d6f8775..cc88ab1 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
@@ -131,20 +131,6 @@
* {@inheritDoc}
*/
public boolean canQuit(WizardStep step) {
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean canClose(WizardStep step) {
- return step == Step.PROGRESS;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean canCancel(WizardStep step) {
return step == Step.CONFIRM_UNINSTALL;
}
@@ -178,18 +164,6 @@
}
/**
- * {@inheritDoc}
- */
- public void cancelClicked(WizardStep cStep, QuickSetup qs) {
- if (cStep == Step.CONFIRM_UNINSTALL) {
- qs.quit();
- } else {
- throw new IllegalStateException(
- "Cancel only can be clicked on CONFIRM_UNINSTALL step");
- }
- }
-
- /**
* Update the UserData object according to the content of the review
* panel.
*/
@@ -633,6 +607,20 @@
/**
* {@inheritDoc}
*/
+ public boolean isCancellable() {
+ return false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void cancel() {
+ // do nothing; not cancellable
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public void windowClosing(QuickSetupDialog dlg, WindowEvent evt) {
if (dlg.getDisplayedStep() == Step.PROGRESS) {
// Simulate a close button event
--
Gitblit v1.10.0