From 7ae21709bb6dbdc092052acb5098bfa5cb316d9e Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 29 Mar 2007 15:09:14 +0000
Subject: [PATCH] These refactorings are essential in anticipation of a new quicksetup application for the upgrader feature (issue 598).  These changes were reviewed by Josu. 

---
 opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java |   54 ++++++++++++++----------------------------------------
 1 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java b/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
index b2c7b3d..19494ba 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
@@ -38,19 +38,13 @@
 import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
 
-import org.opends.quicksetup.ButtonName;
-import org.opends.quicksetup.CurrentInstallStatus;
-import org.opends.quicksetup.Step;
+import org.opends.quicksetup.*;
 import org.opends.quicksetup.event.ButtonActionListener;
 import org.opends.quicksetup.event.ButtonEvent;
 import org.opends.quicksetup.event.MinimumSizeComponentListener;
 import org.opends.quicksetup.i18n.ResourceProvider;
 import org.opends.quicksetup.installer.FieldName;
-import org.opends.quicksetup.installer.InstallProgressDescriptor;
-import org.opends.quicksetup.installer.InstallProgressStep;
-import org.opends.quicksetup.installer.UserInstallData;
-import org.opends.quicksetup.uninstaller.UninstallProgressDescriptor;
-import org.opends.quicksetup.uninstaller.UninstallProgressStep;
+import org.opends.quicksetup.ProgressDescriptor;
 import org.opends.quicksetup.util.ProgressMessageFormatter;
 import org.opends.quicksetup.util.Utils;
 
@@ -82,7 +76,7 @@
 
   private Step displayedStep;
 
-  private UserInstallData defaultUserData;
+  private UserData defaultUserData;
 
   private CurrentInstallStatus installStatus;
 
@@ -97,7 +91,7 @@
    * the wizard.
    * @param installStatus the current installation status.
    */
-  public QuickSetupDialog(UserInstallData defaultUserData,
+  public QuickSetupDialog(UserData defaultUserData,
       CurrentInstallStatus installStatus)
   {
     this.defaultUserData = defaultUserData;
@@ -210,11 +204,9 @@
     int minHeight = (int) frame.getPreferredSize().getHeight();
 
     ComponentListener[] listeners = frame.getComponentListeners();
-    for (int i=0; i<listeners.length; i++)
-    {
-      if (listeners[i] instanceof MinimumSizeComponentListener)
-      {
-        frame.removeComponentListener(listeners[i]);
+    for (ComponentListener listener : listeners) {
+      if (listener instanceof MinimumSizeComponentListener) {
+        frame.removeComponentListener(listener);
       }
     }
     frame.addComponentListener(new MinimumSizeComponentListener(frame,
@@ -223,12 +215,12 @@
 
   /**
    * Displays the panel corresponding to the provided step.  The panel contents
-   * are updated with the contents of the UserInstallData object.
+   * are updated with the contents of the UserData object.
    * @param step the step that we want to display.
-   * @param userData the UserInstallData object that must be used to populate
+   * @param userData the UserData object that must be used to populate
    * the panels.
    */
-  public void setDisplayedStep(Step step, UserInstallData userData)
+  public void setDisplayedStep(Step step, UserData userData)
   {
     displayedStep = step;
     if (isUninstall())
@@ -321,33 +313,15 @@
   }
 
   /**
-   * Forwards to the displayed panel the InstallProgressDescriptor so that they
+   * Forwards to the displayed panel the ProgressDescriptor so that they
    * can update their contents accordingly.
    * @param descriptor the descriptor of the Installation progress.
    */
-  public void displayProgress(InstallProgressDescriptor descriptor)
+  public void displayProgress(ProgressDescriptor descriptor)
   {
     getCurrentStepPanel().displayProgress(descriptor);
-    InstallProgressStep status = descriptor.getProgressStep();
-    if ((status == InstallProgressStep.FINISHED_SUCCESSFULLY)
-        || (status == InstallProgressStep.FINISHED_WITH_ERROR))
-    {
-      setButtonEnabled(ButtonName.CLOSE, true);
-    }
-  }
-
-  /**
-   * Forwards to the displayed panel the UninstallProgressDescriptor so that
-   * they can update their contents accordingly.
-   * @param descriptor the descriptor of the Uninstallation progress.
-   */
-  public void displayProgress(UninstallProgressDescriptor descriptor)
-  {
-    getCurrentStepPanel().displayProgress(descriptor);
-    UninstallProgressStep status = descriptor.getProgressStep();
-    if ((status == UninstallProgressStep.FINISHED_SUCCESSFULLY)
-        || (status == UninstallProgressStep.FINISHED_WITH_ERROR))
-    {
+    ProgressStep status = descriptor.getProgressStep();
+    if (status.isLast()) {
       setButtonEnabled(ButtonName.CLOSE, true);
     }
   }

--
Gitblit v1.10.0