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/guitools/org/opends/guitools/controlpanel/task/Task.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/Task.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/Task.java
index 232430d..094f773 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/Task.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/Task.java
@@ -55,7 +55,7 @@
import org.opends.guitools.controlpanel.util.ConfigReader;
import org.opends.guitools.controlpanel.util.ProcessReader;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.UserData;
import org.forgerock.opendj.ldap.ByteString;
@@ -423,7 +423,7 @@
* quit and there are tasks running.
* @return the description of the task.
*/
- public abstract Message getTaskDescription();
+ public abstract LocalizableMessage getTaskDescription();
/**
* Adds a configuration element created listener.
@@ -608,7 +608,7 @@
* launched in paralel with this task and <CODE>false</CODE> otherwise.
*/
public abstract boolean canLaunch(Task taskToBeLaunched,
- Collection<Message> incompatibilityReasons);
+ Collection<LocalizableMessage> incompatibilityReasons);
/**
* Execute the task. This method is synchronous.
@@ -1046,7 +1046,7 @@
* @param msg the message associated with the command line.
*/
protected void printEquivalentCommandLine(String cmdName, List<String> args,
- Message msg)
+ LocalizableMessage msg)
{
getProgressDialog().appendProgressHtml(Utilities.applyFont(msg+"<br><b>"+
getEquivalentCommandLine(cmdName, args)+"</b><br><br>",
@@ -1106,7 +1106,7 @@
* @param taskToBeLaunched the task that we are trying to launch.
* @return the incompatible message between two tasks.
*/
- protected Message getIncompatibilityMessage(Task taskRunning,
+ protected LocalizableMessage getIncompatibilityMessage(Task taskRunning,
Task taskToBeLaunched)
{
return INFO_CTRL_PANEL_INCOMPATIBLE_TASKS.get(
--
Gitblit v1.10.0