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/ManageTasksPanel.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
index eeaf71f..d2abae5 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
@@ -72,7 +72,7 @@
import org.opends.guitools.controlpanel.ui.renderer.TaskCellRenderer;
import org.opends.guitools.controlpanel.util.ConfigFromFile;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.quicksetup.util.Utils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tools.tasks.TaskEntry;
@@ -117,7 +117,7 @@
private ManageTasksMenuBar menuBar;
- private MonitoringAttributesViewPanel<Message> operationViewPanel;
+ private MonitoringAttributesViewPanel<LocalizableMessage> operationViewPanel;
private GenericDialog operationViewDlg;
private JPanel detailsPanel;
@@ -145,7 +145,7 @@
/**
* {@inheritDoc}
*/
- public Message getTitle()
+ public LocalizableMessage getTitle()
{
return INFO_CTRL_PANEL_TASK_TO_SCHEDULE_LIST_TITLE.get();
}
@@ -322,7 +322,7 @@
logsLabel.setFont(ColorAndFontConstants.titleFont);
add(logsLabel, gbc);
- logs = Utilities.createNonEditableTextArea(Message.EMPTY, 5, 50);
+ logs = Utilities.createNonEditableTextArea(LocalizableMessage.EMPTY, 5, 50);
logs.setFont(ColorAndFontConstants.defaultFont);
gbc.fill = GridBagConstraints.BOTH;
gbc.weightx = 1.0;
@@ -436,13 +436,13 @@
else
{
TaskEntry taskEntry = tasks.iterator().next();
- Map<Message,List<String>> taskSpecificAttrs =
+ Map<LocalizableMessage,List<String>> taskSpecificAttrs =
taskEntry.getTaskSpecificAttributeValuePairs();
- List<Message> lastLogMessages = taskEntry.getLogMessages();
+ List<LocalizableMessage> lastLogMessages = taskEntry.getLogMessages();
if (!lastLogMessages.isEmpty())
{
StringBuilder sb = new StringBuilder();
- for (Message msg : lastLogMessages)
+ for (LocalizableMessage msg : lastLogMessages)
{
if (sb.length() != 0)
{
@@ -472,7 +472,7 @@
gbc.fill = GridBagConstraints.NONE;
gbc.anchor = GridBagConstraints.NORTHWEST;
gbc.insets.top = 10;
- for (Message label : taskSpecificAttrs.keySet())
+ for (LocalizableMessage label : taskSpecificAttrs.keySet())
{
List<String> values = taskSpecificAttrs.get(label);
gbc.gridx = 0;
@@ -545,11 +545,11 @@
"Completion Time",
"Dependency ID",
"Failed Dependency Action",
- "Log Message. Should be pretty long"+
- "Log Message. Should be pretty long"+
- "Log Message. Should be pretty long"+
- "Log Message. Should be pretty long"+
- "Log Message. Should be pretty long",
+ "Log LocalizableMessage. Should be pretty long"+
+ "Log LocalizableMessage. Should be pretty long"+
+ "Log LocalizableMessage. Should be pretty long"+
+ "Log LocalizableMessage. Should be pretty long"+
+ "Log LocalizableMessage. Should be pretty long",
"Notify On Error",
"Notify On Completion",
"Recurring Task Schedule"
@@ -612,11 +612,11 @@
"Completion Time",
"Dependency ID",
"Failed Dependency Action",
- "Log Message. Should be pretty long\n"+
- "Log Message. Should be pretty long\n"+
- "Log Message. Should be pretty long\n"+
- "Log Message. Should be pretty long\n"+
- "Log Message. Should be pretty long\n",
+ "Log LocalizableMessage. Should be pretty long\n"+
+ "Log LocalizableMessage. Should be pretty long\n"+
+ "Log LocalizableMessage. Should be pretty long\n"+
+ "Log LocalizableMessage. Should be pretty long\n"+
+ "Log LocalizableMessage. Should be pretty long\n",
"Notify On Error",
"Notify On Completion",
"Recurring Task Schedule"
@@ -643,7 +643,7 @@
private void cancelTaskClicked()
{
- ArrayList<Message> errors = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> errors = new ArrayList<LocalizableMessage>();
ProgressDialog dlg = new ProgressDialog(
Utilities.createFrame(),
Utilities.getParentDialog(this),
@@ -896,7 +896,7 @@
operationViewDlg.setVisible(true);
if (!operationViewPanel.isCanceled())
{
- LinkedHashSet<Message> displayedAttributes =
+ LinkedHashSet<LocalizableMessage> displayedAttributes =
operationViewPanel.getAttributes();
setAttributesToDisplay(displayedAttributes);
updateTableSizes();
@@ -964,7 +964,7 @@
Utilities.updateScrollMode(tableScroll, taskTable);
}
- private void setAttributesToDisplay(LinkedHashSet<Message> attributes)
+ private void setAttributesToDisplay(LinkedHashSet<LocalizableMessage> attributes)
{
Set<String> selectedIds = getSelectedIds();
tableModel.setAttributes(attributes);
--
Gitblit v1.10.0