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/Installer.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 9c89429..150a5d1 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -607,7 +607,8 @@
* {@inheritDoc}
*/
public Message getFrameTitle() {
- return INFO_FRAME_INSTALL_TITLE.get();
+ return Utils.getCustomizedObject("INFO_FRAME_INSTALL_TITLE",
+ INFO_FRAME_INSTALL_TITLE.get(), Message.class);
}
/** Indicates the current progress step. */
@@ -2065,14 +2066,16 @@
Installation installation = getInstallation();
String cmd = getPath(installation.getControlPanelCommandFile());
cmd = UIFactory.applyFontToHtml(cmd, UIFactory.INSTRUCTIONS_MONOSPACE_FONT);
+ Message successMessage = Utils.getCustomizedObject(
+ "INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY",
+ INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY.get(
+ formatter.getFormattedText(
+ Message.raw(
+ getPath(new File(getInstancePath())))),
+ INFO_GENERAL_SERVER_STOPPED.get(),
+ cmd), Message.class);
hmSummary.put(InstallProgressStep.FINISHED_SUCCESSFULLY,
- getFormattedSuccess(
- INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY.get(
- formatter.getFormattedText(
- Message.raw(
- getPath(new File(getInstancePath())))),
- INFO_GENERAL_SERVER_STOPPED.get(),
- cmd)));
+ getFormattedSuccess(successMessage));
hmSummary.put(InstallProgressStep.FINISHED_CANCELED,
getFormattedSuccess(INFO_SUMMARY_INSTALL_FINISHED_CANCELED.get()));
hmSummary.put(InstallProgressStep.FINISHED_WITH_ERROR,
@@ -2100,14 +2103,16 @@
{
status = INFO_GENERAL_SERVER_STOPPED.get();
}
+ Message successMessage = Utils.getCustomizedObject(
+ "INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY",
+ INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY.get(
+ formatter.getFormattedText(
+ Message.raw(
+ getPath(new File(getInstancePath())))),
+ status,
+ cmd), Message.class);
hmSummary.put(InstallProgressStep.FINISHED_SUCCESSFULLY,
- getFormattedSuccess(
- INFO_SUMMARY_INSTALL_FINISHED_SUCCESSFULLY.get(
- formatter.getFormattedText(
- Message.raw(
- getPath(new File(getInstancePath())))),
- status,
- cmd)));
+ getFormattedSuccess(successMessage));
hmSummary.put(InstallProgressStep.FINISHED_WITH_ERROR,
getFormattedError(INFO_SUMMARY_INSTALL_FINISHED_WITH_ERROR.get(
status,
--
Gitblit v1.10.0