From 776abd81a05b07b5e13ab16a614a966e522dbc1c Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 17 May 2007 22:01:41 +0000
Subject: [PATCH] Made minor fix and improved messages for errors when the user lacks the proper file system access permissions to use the upgrade tool. Also updated the text on the Welcome page to reflect removal of the build browsing capability.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/WelcomePanel.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/WelcomePanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/WelcomePanel.java
index ea4151e..736dc24 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/WelcomePanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/WelcomePanel.java
@@ -33,11 +33,11 @@
import org.opends.quicksetup.UserData;
import org.opends.quicksetup.event.BrowseActionListener;
import org.opends.quicksetup.upgrader.Upgrader;
+import org.opends.server.util.DynamicConstants;
import javax.swing.*;
import javax.swing.text.JTextComponent;
import java.awt.*;
-import java.util.ArrayList;
/**
* This panel is used to show a welcome message. If this is the WebStart,
@@ -94,18 +94,10 @@
* We can use org.opends.server.util.DynamicConstants without problems as it
* has been added to quicksetup.jar during build time.
*/
- java.util.List<String> args = new ArrayList<String>();
- String msgKey;
- if (Utils.isWebStart()) {
- msgKey = "upgrade-welcome-panel-webstart-instructions";
- String cmd = Utils.isWindows() ? Installation.WINDOWS_UPGRADE_FILE_NAME :
- Installation.UNIX_UPGRADE_FILE_NAME;
- args.add(UIFactory.applyFontToHtml(cmd,
- UIFactory.INSTRUCTIONS_MONOSPACE_FONT));
- } else {
- msgKey = "upgrade-welcome-panel-offline-instructions";
- }
- return getMsg(msgKey, args.toArray(new String[0]));
+ return getMsg("upgrade-welcome-panel-webstart-instructions",
+ new String[] {
+ DynamicConstants.COMPACT_VERSION_STRING,
+ DynamicConstants.BUILD_ID});
}
/**
--
Gitblit v1.10.0