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/upgrader/ui/WelcomePanel.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/WelcomePanel.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/WelcomePanel.java
index 4a2dacf..2dcd3c4 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/WelcomePanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/WelcomePanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.upgrader.ui;
@@ -114,9 +114,12 @@
* We can use org.opends.server.util.DynamicConstants without problems as it
* has been added to quicksetup.jar during build time.
*/
- return INFO_UPGRADE_WELCOME_PANEL_WEBSTART_INSTRUCTIONS.get(
- DynamicConstants.COMPACT_VERSION_STRING,
- DynamicConstants.BUILD_ID);
+ return Utils.getCustomizedObject(
+ "INFO_UPGRADE_WELCOME_PANEL_WEBSTART_INSTRUCTIONS",
+ INFO_UPGRADE_WELCOME_PANEL_WEBSTART_INSTRUCTIONS.get(
+ DynamicConstants.COMPACT_VERSION_STRING,
+ DynamicConstants.BUILD_ID),
+ Message.class);
}
/**
--
Gitblit v1.10.0