From 81d36161ce5367fa7aa9a5d99dc8b80eacfa7cdf Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 24 Jan 2014 14:43:46 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
index 772266f..fb57022 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.quicksetup.installer.webstart;
@@ -51,7 +51,7 @@
import org.opends.quicksetup.util.FileManager;
import org.opends.server.util.SetupUtils;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.QuickSetupMessages.*;
/**
@@ -84,8 +84,8 @@
private final Map<ProgressStep, Integer> hmRatio =
new HashMap<ProgressStep, Integer>();
- private final Map<ProgressStep, Message> hmSummary =
- new HashMap<ProgressStep, Message>();
+ private final Map<ProgressStep, LocalizableMessage> hmSummary =
+ new HashMap<ProgressStep, LocalizableMessage>();
private static final Logger LOG =
Logger.getLogger(WebStartInstaller.class.getName());
@@ -300,7 +300,7 @@
notifyListeners(getLineBreak());
updateSummaryWithServerState(hmSummary, false);
setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
- Message html = getFormattedError(ex, true);
+ LocalizableMessage html = getFormattedError(ex, true);
notifyListeners(html);
LOG.log(Level.SEVERE, "Error installing.", ex);
notifyListeners(getLineBreak());
@@ -324,7 +324,7 @@
ApplicationException ex = new ApplicationException(
ReturnCode.BUG,
Utils.getThrowableMsg(INFO_BUG_MSG.get(), t), t);
- Message msg = getFormattedError(ex, true);
+ LocalizableMessage msg = getFormattedError(ex, true);
notifyListeners(msg);
LOG.log(Level.SEVERE, "Error installing.", t);
notifyListeners(getLineBreak());
@@ -347,9 +347,9 @@
* {@inheritDoc}
*/
@Override
- public Message getSummary(ProgressStep status)
+ public LocalizableMessage getSummary(ProgressStep status)
{
- Message summary;
+ LocalizableMessage summary;
if (InstallProgressStep.DOWNLOADING.equals(status)) {
summary = loader.getSummary();
} else {
--
Gitblit v1.10.0