From d880364f313980e530642168519e7660be84f0a4 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 26 Jun 2013 19:58:40 +0000
Subject: [PATCH] Backport fix for OPENDJ-1029: Java webstart installer includes hard-coded documentation URL
---
opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java | 29 ++---------------------------
1 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
index f800b37..9935ef8 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.quicksetup.installer.ui;
@@ -37,9 +37,7 @@
import org.opends.quicksetup.ui.GuiApplication;
import org.opends.quicksetup.ui.QuickSetupStepPanel;
-import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.util.Utils;
-import org.opends.quicksetup.Installation;
/**
* This panel is used to show a welcome message.
@@ -75,28 +73,7 @@
* We can use org.opends.server.util.DynamicConstants without problems as it
* has been added to quicksetup.jar during build time.
*/
- Message message;
- if (Utils.isWebStart())
- {
- String cmd = Utils.isWindows()? Installation.WINDOWS_SETUP_FILE_NAME:
- Installation.UNIX_SETUP_FILE_NAME;
- message = Utils.getCustomizedObject(
- "INFO_WELCOME_PANEL_WEBSTART_INSTRUCTIONS",
- INFO_WELCOME_PANEL_WEBSTART_INSTRUCTIONS.get(
- DynamicConstants.SHORT_NAME,
- DynamicConstants.SHORT_NAME,
- UIFactory.applyFontToHtml(cmd,
- UIFactory.INSTRUCTIONS_MONOSPACE_FONT),
- DynamicConstants.SHORT_NAME,
- DynamicConstants.COMPACT_VERSION_STRING,
- DynamicConstants.BUILD_ID,
- DynamicConstants.SHORT_NAME,
- DynamicConstants.SHORT_NAME),
- Message.class);
- }
- else
- {
- message = Utils.getCustomizedObject(
+ return Utils.getCustomizedObject(
"INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS",
INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS.get(
DynamicConstants.SHORT_NAME,
@@ -104,8 +81,6 @@
DynamicConstants.DOC_REFERENCE_WIKI,
DynamicConstants.SHORT_NAME),
Message.class);
- }
- return message;
}
/**
--
Gitblit v1.10.0