From bb1b4f1a882179359bf027bdf6acb8e9c40e5ab7 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 10 May 2007 14:16:11 +0000
Subject: [PATCH] This commit addresses several issues that Brian brought up regarding the upgrader.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/ChooseVersionPanel.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/ChooseVersionPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/ChooseVersionPanel.java
index 59fef13..b122c00 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/ChooseVersionPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/ChooseVersionPanel.java
@@ -59,7 +59,9 @@
private JRadioButton rbLocal = null;
private ButtonGroup grpRemoteLocal = null;
private JComboBox cboBuild = null;
+ private JLabel lblFile = null;
private JTextField tfFile = null;
+ private JButton butBrowse = null;
private boolean loadBuildListAttempted = false;
private RemoteBuildListComboBoxModelCreator bld = null;
@@ -101,7 +103,7 @@
public void actionPerformed(ActionEvent evt) {
rbLocal.setSelected(true);
rbRemote.setEnabled(false);
- cboBuild.setEnabled(false);
+ setComponentEnablement();
cboBuild.setRenderer(new BuildListLoadingComboBoxRenderer());
try {
loadBuildList();
@@ -164,7 +166,8 @@
tfFile = new JTextField();
tfFile.setColumns(20);
- JButton butBrowse = UIFactory.makeJButton(getMsg("browse-button-label"),
+ butBrowse =
+ UIFactory.makeJButton(getMsg("browse-button-label"),
getMsg("browse-button-tooltip"));
BrowseActionListener l =
@@ -173,13 +176,24 @@
getMainWindow());
butBrowse.addActionListener(l);
- JPanel pnlBrowse = Utilities.createBrowseButtonPanel(
- UIFactory.makeJLabel(null,
+ lblFile = UIFactory.makeJLabel(null,
getMsg("upgrade-choose-version-local-path"),
- UIFactory.TextStyle.SECONDARY_FIELD_VALID),
+ UIFactory.TextStyle.SECONDARY_FIELD_VALID);
+
+ JPanel pnlBrowse = Utilities.createBrowseButtonPanel(
+ lblFile,
tfFile,
butBrowse);
+ ActionListener radioListener = new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ setComponentEnablement();
+ }
+ };
+
+ rbRemote.addActionListener(radioListener);
+ rbLocal.addActionListener(radioListener);
+
p.setLayout(new GridBagLayout());
// p.setBorder(BorderFactory.createLineBorder(Color.RED));
GridBagConstraints gbc = new GridBagConstraints();
@@ -416,6 +430,7 @@
rbRemote.setSelected(false);
// grpRemoteLocal.setSelected(rbRemote.getModel(), false);
rbRemote.setEnabled(false);
+ setComponentEnablement();
}
});
} else {
@@ -433,11 +448,11 @@
cboBuild.setModel(cbmFinal);
cboBuild.setRenderer(new DefaultListCellRenderer());
// Disable the remote widgets
- cboBuild.setEnabled(true);
rbLocal.setSelected(false);
rbRemote.setSelected(true);
// grpRemoteLocal.setSelected(rbRemote.getModel(), false);
rbRemote.setEnabled(true);
+ setComponentEnablement();
}
});
}
@@ -452,4 +467,10 @@
}
}
+ private void setComponentEnablement() {
+ cboBuild.setEnabled(rbRemote.isSelected());
+ lblFile.setEnabled(rbLocal.isSelected());
+ tfFile.setEnabled(rbLocal.isSelected());
+ butBrowse.setEnabled((rbLocal.isSelected()));
+ }
}
--
Gitblit v1.10.0