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/RestorePanel.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java
index ba33c12..280a67e 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -52,7 +53,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.server.tools.RestoreDB;
/**
@@ -80,7 +81,7 @@
/**
* {@inheritDoc}
*/
- public Message getTitle()
+ public LocalizableMessage getTitle()
{
return INFO_CTRL_PANEL_RESTORE_PANEL_TITLE.get();
}
@@ -167,7 +168,7 @@
*/
protected void verifyBackupClicked()
{
- LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+ LinkedHashSet<LocalizableMessage> errors = new LinkedHashSet<LocalizableMessage>();
// Launch the task in another progress dialog.
ProgressDialog dlg = new ProgressDialog(
Utilities.createFrame(),
@@ -259,7 +260,7 @@
setPrimaryValid(lAvailableBackups);
setPrimaryValid(lBackupID);
- final LinkedHashSet<Message> errors = new LinkedHashSet<Message>();
+ final LinkedHashSet<LocalizableMessage> errors = new LinkedHashSet<LocalizableMessage>();
BackupDescriptor backup = getSelectedBackup();
@@ -402,7 +403,7 @@
/**
* {@inheritDoc}
*/
- public Message getTaskDescription()
+ public LocalizableMessage getTaskDescription()
{
if (verify)
{
@@ -418,7 +419,7 @@
* {@inheritDoc}
*/
public boolean canLaunch(Task taskToBeLaunched,
- Collection<Message> incompatibilityReasons)
+ Collection<LocalizableMessage> incompatibilityReasons)
{
boolean canLaunch = true;
if (state == State.RUNNING && runningOnSameServer(taskToBeLaunched))
--
Gitblit v1.10.0