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/ui/ProgressPanel.java | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java b/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java
index 1743dbe..13d8c4b 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressPanel.java
@@ -33,12 +33,7 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import javax.swing.Box;
-import javax.swing.JEditorPane;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.JScrollPane;
+import javax.swing.*;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
@@ -59,6 +54,8 @@
private JProgressBar progressBar;
+ private JButton btnCancel;
+
private JEditorPane detailsTextArea;
private String lastText;
@@ -178,6 +175,7 @@
if (status.isLast()) {
progressBar.setVisible(false);
+ btnCancel.setVisible(false);
if (!status.isError()) {
summaryText = "<form>"+summaryText+"</form>";
}
@@ -206,6 +204,20 @@
gbc.insets = UIFactory.getEmptyInsets();
gbc.fill = GridBagConstraints.HORIZONTAL;
+ btnCancel = UIFactory.makeJButton(
+ getMsg("cancel-button-label"),
+ getMsg("cancel-button-tooltip"));
+ btnCancel.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ GuiApplication app = getApplication();
+ QuickSetup qs = getQuickSetup();
+ if (app.confirmCancel(qs)) {
+ app.cancel();
+ btnCancel.setEnabled(false);
+ }
+ }
+ });
+
progressBar = new JProgressBar();
progressBar.setIndeterminate(true);
// The ProgressDescriptor provides the ratio in %
@@ -221,10 +233,48 @@
gbc.gridwidth = GridBagConstraints.RELATIVE;
gbc.weightx = 0.0;
panel.add(progressBar, gbc);
+
+ if (getApplication().isCancellable()) {
+ gbc.insets.left = 15;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.anchor = GridBagConstraints.LINE_START;
+ gbc.gridwidth = 1;
+ panel.add(btnCancel, gbc);
+ }
+
gbc.gridwidth = GridBagConstraints.REMAINDER;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
gbc.weightx = 1.0;
panel.add(Box.createHorizontalGlue(), gbc);
+
+
return panel;
}
+
+// public static void main(String[] args) {
+// final UserData ud = new UpgradeUserData();
+// ud.setServerLocation("XXX/XXXXX/XX/XXXXXXXXXXXX/XXXX");
+// Upgrader app = new Upgrader();
+// app.setUserData(ud);
+// final ProgressPanel p = new ProgressPanel(app);
+// p.initialize();
+// JFrame frame = new JFrame();
+// frame.getContentPane().add(p);
+// frame.addComponentListener(new ComponentAdapter() {
+// public void componentHidden(ComponentEvent componentEvent) {
+// System.exit(0);
+// }
+// });
+// frame.pack();
+// frame.setVisible(true);
+// new Thread(new Runnable() {
+// public void run() {
+// p.beginDisplay(ud);
+// }
+// }).start();
+//
+// }
+
+
}
--
Gitblit v1.10.0