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/MainMenuBar.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/MainMenuBar.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/MainMenuBar.java
index 2c3a95d..e87d5ca 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/MainMenuBar.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/MainMenuBar.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -43,7 +44,7 @@
import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
import org.opends.guitools.controlpanel.task.Task;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
/**
* The menu bar that appears on the main panel.
@@ -103,8 +104,8 @@
if (runningTasks.size() > 0)
{
String allTasks = Utilities.getStringFromCollection(runningTasks, "<br>");
- Message title = INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get();
- Message msg =
+ LocalizableMessage title = INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get();
+ LocalizableMessage msg =
INFO_CTRL_PANEL_RUNNING_TASKS_CONFIRMATION_DETAILS.get(allTasks);
confirmed = Utilities.displayConfirmationDialog(
Utilities.getParentDialog(this), title, msg);
@@ -262,8 +263,8 @@
if (runningTasks.size() > 0)
{
String allTasks = Utilities.getStringFromCollection(runningTasks, "<br>");
- Message title = INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get();
- Message msg =
+ LocalizableMessage title = INFO_CTRL_PANEL_CONFIRMATION_REQUIRED_SUMMARY.get();
+ LocalizableMessage msg =
INFO_CTRL_PANEL_RUNNING_TASKS_CHANGE_SERVER_CONFIRMATION_DETAILS.get(
allTasks);
confirmed = Utilities.displayConfirmationDialog(
--
Gitblit v1.10.0