From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0
---
opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 9369df7..552a7f6 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
@@ -22,13 +22,14 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.installer.ui;
import org.opends.messages.Message;
import static org.opends.messages.QuickSetupMessages.*;
+
import org.opends.server.util.DynamicConstants;
import java.awt.Component;
@@ -78,17 +79,23 @@
{
String cmd = Utils.isWindows()? Installation.WINDOWS_SETUP_FILE_NAME:
Installation.UNIX_SETUP_FILE_NAME;
- message = INFO_WELCOME_PANEL_WEBSTART_INSTRUCTIONS.get(
+ message = Utils.getCustomizedObject(
+ "INFO_WELCOME_PANEL_WEBSTART_INSTRUCTIONS",
+ INFO_WELCOME_PANEL_WEBSTART_INSTRUCTIONS.get(
UIFactory.applyFontToHtml(cmd,
UIFactory.INSTRUCTIONS_MONOSPACE_FONT),
DynamicConstants.COMPACT_VERSION_STRING,
- DynamicConstants.BUILD_ID);
+ DynamicConstants.BUILD_ID),
+ Message.class);
}
else
{
- message = INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS.get(
+ message = Utils.getCustomizedObject(
+ "INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS",
+ INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS.get(
DynamicConstants.COMPACT_VERSION_STRING,
- DynamicConstants.BUILD_ID);
+ DynamicConstants.BUILD_ID),
+ Message.class);
}
return message;
}
--
Gitblit v1.10.0