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/ProgressPanel.java | 62 ++++++------------------------
1 files changed, 13 insertions(+), 49 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java b/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java
index 8c2ec72..b71c835 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java
@@ -43,11 +43,9 @@
import javax.swing.event.HyperlinkListener;
import org.opends.quicksetup.ButtonName;
+import org.opends.quicksetup.ProgressStep;
import org.opends.quicksetup.event.ButtonEvent;
-import org.opends.quicksetup.installer.InstallProgressDescriptor;
-import org.opends.quicksetup.installer.InstallProgressStep;
-import org.opends.quicksetup.uninstaller.UninstallProgressDescriptor;
-import org.opends.quicksetup.uninstaller.UninstallProgressStep;
+import org.opends.quicksetup.ProgressDescriptor;
/**
* This panel is used to show the progress of the install or the uninstall.
@@ -63,8 +61,6 @@
private JEditorPane detailsTextArea;
- private JScrollPane scroll;
-
private String lastText;
/**
@@ -123,7 +119,7 @@
gbc.insets = UIFactory.getEmptyInsets();
panel.add(l, gbc);
- scroll = new JScrollPane();
+ JScrollPane scroll = new JScrollPane();
detailsTextArea = UIFactory.makeProgressPane(scroll);
detailsTextArea.setBackground(
UIFactory.CURRENT_STEP_PANEL_BACKGROUND);
@@ -134,9 +130,8 @@
if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
{
String url = e.getURL().toString();
- String newText = getFormatter().getFormattedAfterUrlClick(url,
+ lastText = getFormatter().getFormattedAfterUrlClick(url,
lastText);
- lastText = newText;
detailsTextArea.setText(lastText);
}
}
@@ -174,52 +169,21 @@
/**
* {@inheritDoc}
*/
- public void displayProgress(InstallProgressDescriptor descriptor)
+ public void displayProgress(ProgressDescriptor descriptor)
{
- InstallProgressStep status = descriptor.getProgressStep();
+ ProgressStep status = descriptor.getProgressStep();
String summaryText = UIFactory.applyFontToHtml(descriptor
.getProgressBarMsg(), UIFactory.PROGRESS_FONT);
- if (status == InstallProgressStep.FINISHED_SUCCESSFULLY)
- {
- summaryText = "<form>"+summaryText+"</form>";
+
+ if (status.isLast() && !status.isError()) {
+ progressBar.setVisible(false);
+ if (!status.isError()) {
+ summaryText = "<form>"+summaryText+"</form>";
+ }
}
progressBarLabel.setText(summaryText);
- if ((status == InstallProgressStep.FINISHED_WITH_ERROR)
- || (status == InstallProgressStep.FINISHED_SUCCESSFULLY))
- {
- progressBar.setVisible(false);
- }
- int v = descriptor.getProgressBarRatio().intValue();
- if (v > 0)
- {
- progressBar.setIndeterminate(false);
- progressBar.setValue(v);
- }
- lastText = descriptor.getDetailsMsg();
- detailsTextArea.setText(lastText);
- }
-
- /**
- * {@inheritDoc}
- */
- public void displayProgress(UninstallProgressDescriptor descriptor)
- {
- UninstallProgressStep status = descriptor.getProgressStep();
- String summaryText = UIFactory.applyFontToHtml(descriptor
- .getProgressBarMsg(), UIFactory.PROGRESS_FONT);
- if (status == UninstallProgressStep.FINISHED_SUCCESSFULLY)
- {
- summaryText = "<form>"+summaryText+"</form>";
- }
- progressBarLabel.setText(summaryText);
-
- if ((status == UninstallProgressStep.FINISHED_WITH_ERROR)
- || (status == UninstallProgressStep.FINISHED_SUCCESSFULLY))
- {
- progressBar.setVisible(false);
- }
- int v = descriptor.getProgressBarRatio().intValue();
+ int v = descriptor.getProgressBarRatio();
if (v > 0)
{
progressBar.setIndeterminate(false);
--
Gitblit v1.10.0