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/ui/ImportLDIFPanel.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
index f647c4f..7f0e3e1 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -62,7 +63,7 @@
import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
import org.opends.guitools.controlpanel.task.Task;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.util.Utils;
import org.opends.server.tools.ImportLDIF;
@@ -126,7 +127,7 @@
/**
* {@inheritDoc}
*/
- public Message getTitle()
+ public LocalizableMessage getTitle()
{
return INFO_CTRL_PANEL_IMPORT_LDIF_TITLE.get();
}
@@ -577,7 +578,7 @@
setPrimaryValid(lRejectsFile);
setPrimaryValid(lSkipsFile);
setPrimaryValid(lThreads);
- final LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+ final LinkedHashSet<LocalizableMessage> errors = new LinkedHashSet<LocalizableMessage>();
String backendName = (String)backends.getSelectedItem();
if (backendName == null)
@@ -822,7 +823,7 @@
/**
* {@inheritDoc}
*/
- public Message getTaskDescription()
+ public LocalizableMessage getTaskDescription()
{
return INFO_CTRL_PANEL_IMPORT_TASK_DESCRIPTION.get(fileName,
backendSet.iterator().next());
@@ -832,7 +833,7 @@
* {@inheritDoc}
*/
public boolean canLaunch(Task taskToBeLaunched,
- Collection<Message> incompatibilityReasons)
+ Collection<LocalizableMessage> incompatibilityReasons)
{
boolean canLaunch = true;
if (state == State.RUNNING && runningOnSameServer(taskToBeLaunched))
@@ -1020,7 +1021,7 @@
for (DN baseDN : replicatedBaseDNs)
{
- Message msg = INFO_PROGRESS_INITIALIZING_SUFFIX.get(baseDN.toString(),
+ LocalizableMessage msg = INFO_PROGRESS_INITIALIZING_SUFFIX.get(baseDN.toString(),
ConnectionUtils.getHostPort(getInfo().getDirContext()));
getProgressDialog().appendProgressHtml(Utilities.applyFont(
msg.toString()+"<br>", ColorAndFontConstants.progressFont));
--
Gitblit v1.10.0