From f10eeefc3ab93b6173fd4edbf196ca863344b4dc Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 11 Dec 2006 15:34:39 +0000
Subject: [PATCH] The following modifications include the comments from Neil and Brian (thanks to both for your help):
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/InstallWelcomePanel.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/WelcomePanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/InstallWelcomePanel.java
similarity index 66%
rename from opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/WelcomePanel.java
rename to opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/InstallWelcomePanel.java
index b672d19..f7b8cec 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/WelcomePanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/InstallWelcomePanel.java
@@ -29,11 +29,13 @@
import java.awt.Component;
+import org.opends.quicksetup.util.Utils;
+
/**
* This panel is used to show a welcome message.
*
*/
-class WelcomePanel extends QuickSetupStepPanel
+class InstallWelcomePanel extends QuickSetupStepPanel
{
private static final long serialVersionUID = 6209217138897900860L;
@@ -41,7 +43,7 @@
* Default constructor.
*
*/
- public WelcomePanel()
+ public InstallWelcomePanel()
{
createLayout();
}
@@ -63,10 +65,26 @@
* We can use org.opends.server.util.DynamicConstants without problems as it
* has been added to quicksetup.jar during build time.
*/
- String[] args =
- { org.opends.server.util.DynamicConstants.COMPACT_VERSION_STRING,
- org.opends.server.util.DynamicConstants.BUILD_ID };
- return getMsg("welcome-panel-instructions", args);
+ String[] args;
+ String msgKey;
+ if (Utils.isWebStart())
+ {
+ msgKey = "welcome-panel-webstart-instructions";
+ args = new String[3];
+ String cmd = Utils.isWindows()?"setup.bat":"setup";
+ args[0] = UIFactory.applyFontToHtml(cmd,
+ UIFactory.INSTRUCTIONS_MONOSPACE_FONT);
+ args[1] = org.opends.server.util.DynamicConstants.COMPACT_VERSION_STRING;
+ args[2] = org.opends.server.util.DynamicConstants.BUILD_ID;
+ }
+ else
+ {
+ args = new String[2];
+ args[0] = org.opends.server.util.DynamicConstants.COMPACT_VERSION_STRING;
+ args[1] = org.opends.server.util.DynamicConstants.BUILD_ID;
+ msgKey = "welcome-panel-offline-instructions";
+ }
+ return getMsg(msgKey, args);
}
/**
--
Gitblit v1.10.0