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/QuickSetupStepPanel.java | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupStepPanel.java b/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupStepPanel.java
index 63854bd..ef04467 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupStepPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupStepPanel.java
@@ -45,10 +45,8 @@
import org.opends.quicksetup.event.ButtonActionListener;
import org.opends.quicksetup.event.ButtonEvent;
import org.opends.quicksetup.installer.FieldName;
-import org.opends.quicksetup.installer.InstallProgressDescriptor;
-import org.opends.quicksetup.installer.LabelFieldDescriptor;
-import org.opends.quicksetup.installer.UserInstallData;
-import org.opends.quicksetup.uninstaller.UninstallProgressDescriptor;
+import org.opends.quicksetup.ProgressDescriptor;
+import org.opends.quicksetup.UserData;
import org.opends.quicksetup.util.HtmlProgressMessageFormatter;
import org.opends.quicksetup.util.ProgressMessageFormatter;
import org.opends.quicksetup.util.URLWorker;
@@ -83,7 +81,7 @@
*
* @param data the new user data.
*/
- public void beginDisplay(UserInstallData data)
+ public void beginDisplay(UserData data)
{
}
@@ -99,16 +97,7 @@
* ProgressPanel overwrites this method and for all the others it stays empty.
* @param descriptor the descriptor of the Installation progress.
*/
- public void displayProgress(InstallProgressDescriptor descriptor)
- {
- }
-
- /**
- * Called when a progress change must be reflected in the panels. Only
- * ProgressPanel overwrites this method and for all the others it stays empty.
- * @param descriptor the descriptor of the Uninstallation progress.
- */
- public void displayProgress(UninstallProgressDescriptor descriptor)
+ public void displayProgress(ProgressDescriptor descriptor)
{
}
@@ -191,9 +180,8 @@
*/
public int getMinimumHeight()
{
- int height = (int) getPreferredSize().getHeight();
- return height;
+ return (int) getPreferredSize().getHeight();
}
--
Gitblit v1.10.0