From 5adde80225f547ffe8d50ca83efd121e495d8e53 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 07 Jun 2007 17:31:48 +0000
Subject: [PATCH] This commit:
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/ChooseVersionPanel.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/ChooseVersionPanel.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/ChooseVersionPanel.java
index 4a5c210..a698a29 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/ChooseVersionPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/ChooseVersionPanel.java
@@ -59,7 +59,6 @@
private JLabel lblCurrentVersion = null;
private JRadioButton rbRemote = null;
private JRadioButton rbLocal = null;
- private ButtonGroup grpRemoteLocal = null;
private JComboBox cboBuild = null;
private JLabel lblFile = null;
private JTextField tfFile = null;
@@ -110,7 +109,7 @@
try {
loadBuildList();
} catch (IOException e) {
- LOG.log(Level.INFO, "error", e);
+ LOG.log(Level.INFO, "Error loading build list", e);
}
}
};
@@ -130,7 +129,7 @@
public Object getFieldValue(FieldName fieldName) {
Object value = null;
if (FieldName.UPGRADE_DOWNLOAD.equals(fieldName)) {
- value = new Boolean(rbRemote.isSelected());
+ value = rbRemote.isSelected();
} else if (FieldName.UPGRADE_BUILD_TO_DOWNLOAD.equals(fieldName)) {
value = cboBuild.getSelectedItem();
} else if (FieldName.UPGRADE_FILE.equals(fieldName)) {
@@ -172,7 +171,7 @@
getMsg("upgrade-choose-version-local-tooltip"),
UIFactory.TextStyle.SECONDARY_FIELD_VALID);
- grpRemoteLocal = new ButtonGroup();
+ ButtonGroup grpRemoteLocal = new ButtonGroup();
grpRemoteLocal.add(rbRemote);
grpRemoteLocal.add(rbLocal);
grpRemoteLocal.setSelected(rbRemote.getModel(), true);
@@ -314,7 +313,8 @@
try {
bld = new RemoteBuildListComboBoxModelCreator(rbm);
} catch (IOException e) {
- LOG.log(Level.INFO, "error", e);
+ LOG.log(Level.INFO, "error creating remote build list combo " +
+ "box model creator", e);
}
}
return bld;
@@ -343,7 +343,7 @@
* Creates a default instance.
*/
public BuildListErrorComboBoxRenderer() {
- super("Unable to access remote build information",
+ super(getMsg("upgrade-choose-version-unable-to-access-build-info"),
UIFactory.getImageIcon(UIFactory.IconType.WARNING),
SwingConstants.LEFT);
UIFactory.setTextStyle(this, UIFactory.TextStyle.SECONDARY_STATUS);
@@ -382,7 +382,7 @@
* Creates a default instance.
*/
public BuildListLoadingComboBoxRenderer() {
- super("Loading remote build information...",
+ super(getMsg("upgrade-choose-version-loading-build-info"),
UIFactory.getImageIcon(UIFactory.IconType.WAIT_TINY),
SwingConstants.LEFT);
UIFactory.setTextStyle(this, UIFactory.TextStyle.SECONDARY_STATUS);
@@ -449,11 +449,14 @@
cbm = new DefaultComboBoxModel(buildList.toArray());
} else {
try {
- String[] options = { "Retry", "Close" };
+ String[] options = {
+ getMsg("retry-button-label"),
+ getMsg("close-button-label")
+ };
int i = JOptionPane.showOptionDialog(getMainWindow(),
new BuildListDownloadErrorPanel(rbm,
throwable),
- "Network Error",
+ getMsg("network-error-title"),
JOptionPane.YES_NO_OPTION,
JOptionPane.ERROR_MESSAGE,
null,
@@ -501,7 +504,7 @@
private InputStream getInputStream() throws IOException {
if (this.in == null) {
this.in = rbm.getDailyBuildsInputStream(getMainWindow(),
- "Reading build information");
+ getMsg("upgrade-choose-version-reading-build-info"));
}
return this.in;
}
--
Gitblit v1.10.0