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/TaskToSchedulePanel.java | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
index 481c510..f263693 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -60,7 +61,7 @@
import org.opends.guitools.controlpanel.ui.renderer.
NoLeftInsetCategoryComboBoxRenderer;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.backends.task.RecurringTask;
/**
@@ -139,13 +140,13 @@
private Component monthlyPanel;
private Component cronPanel;
- private Message LAUNCH_NOW = INFO_CTRL_PANEL_LAUNCH_NOW.get();
- private Message LAUNCH_LATER = INFO_CTRL_PANEL_LAUNCH_LATER.get();
- private Message LAUNCH_DAILY = INFO_CTRL_PANEL_TASK_TO_SCHEDULE_DAILY.get();
- private Message LAUNCH_WEEKLY = INFO_CTRL_PANEL_TASK_TO_SCHEDULE_WEEKLY.get();
- private Message LAUNCH_MONTHLY =
+ private LocalizableMessage LAUNCH_NOW = INFO_CTRL_PANEL_LAUNCH_NOW.get();
+ private LocalizableMessage LAUNCH_LATER = INFO_CTRL_PANEL_LAUNCH_LATER.get();
+ private LocalizableMessage LAUNCH_DAILY = INFO_CTRL_PANEL_TASK_TO_SCHEDULE_DAILY.get();
+ private LocalizableMessage LAUNCH_WEEKLY = INFO_CTRL_PANEL_TASK_TO_SCHEDULE_WEEKLY.get();
+ private LocalizableMessage LAUNCH_MONTHLY =
INFO_CTRL_PANEL_TASK_TO_SCHEDULE_MONTHLY.get();
- private Message CRON = INFO_CTRL_PANEL_TASK_TO_SCHEDULE_CRON.get();
+ private LocalizableMessage CRON = INFO_CTRL_PANEL_TASK_TO_SCHEDULE_CRON.get();
private ScheduleType schedule;
@@ -302,7 +303,7 @@
/**
* {@inheritDoc}
*/
- public Message getTitle()
+ public LocalizableMessage getTitle()
{
return INFO_CTRL_PANEL_TASK_TO_SCHEDULE_TITLE.get(taskName);
}
@@ -313,7 +314,7 @@
public void okClicked()
{
schedule = null;
- ArrayList<Message> errorMessages = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> errorMessages = new ArrayList<LocalizableMessage>();
updateErrorMessages(errorMessages);
@@ -333,7 +334,7 @@
* collection of messages with the errors that have been found.
* @param errorMessages the collection of messages to be updated.
*/
- private void updateErrorMessages(Collection<Message> errorMessages)
+ private void updateErrorMessages(Collection<LocalizableMessage> errorMessages)
{
Object type =
((CategorizedComboBoxElement)scheduleType.getSelectedItem()).getValue();
@@ -365,7 +366,7 @@
* The associated labels are also updated.
* @param errorMessages the collection of messages to be updated.
*/
- private void updateLaunchLaterErrorMessages(Collection<Message> errorMessages)
+ private void updateLaunchLaterErrorMessages(Collection<LocalizableMessage> errorMessages)
{
setPrimaryValid(lTime);
setPrimaryValid(lDay);
@@ -426,7 +427,7 @@
* The associated labels are also updated.
* @param errorMessages the collection of messages to be updated.
*/
- private void updateLaunchDailyErrorMessages(Collection<Message> errorMessages)
+ private void updateLaunchDailyErrorMessages(Collection<LocalizableMessage> errorMessages)
{
setPrimaryValid(lDailyTime);
@@ -442,7 +443,7 @@
* @param errorMessages the collection of messages to be updated.
*/
private void updateLaunchWeeklyErrorMessages(
- Collection<Message> errorMessages)
+ Collection<LocalizableMessage> errorMessages)
{
setPrimaryValid(lWeeklyTime);
setPrimaryValid(lWeeklyDays);
@@ -474,7 +475,7 @@
* @param errorMessages the collection of messages to be updated.
*/
private void updateLaunchMonthlyErrorMessages(
- Collection<Message> errorMessages)
+ Collection<LocalizableMessage> errorMessages)
{
setPrimaryValid(lMonthlyTime);
setPrimaryValid(lMonthlyDays);
@@ -505,7 +506,7 @@
* The associated labels are also updated.
* @param errorMessages the collection of messages to be updated.
*/
- private void updateCronErrorMessages(Collection<Message> errorMessages)
+ private void updateCronErrorMessages(Collection<LocalizableMessage> errorMessages)
{
setPrimaryValid(lCronMinute);
setPrimaryValid(lCronHour);
@@ -560,8 +561,8 @@
* @param errorMessages the collection of messages to be updated.
*/
private void updateCronErrorMessages(String value, JLabel label,
- Message errorIfEmpty, Message contentError, int minValue, int maxValue,
- Collection<Message> errorMessages)
+ LocalizableMessage errorIfEmpty, LocalizableMessage contentError, int minValue, int maxValue,
+ Collection<LocalizableMessage> errorMessages)
{
if (value.length() == 0)
{
@@ -694,7 +695,7 @@
* with the encountered problems.
*/
private void checkTime(JTextField time, JLabel lTime, int[] h, int[] m,
- Collection<Message> errorMessages)
+ Collection<LocalizableMessage> errorMessages)
{
String sTime = time.getText().trim();
int index = sTime.indexOf(':');
@@ -845,7 +846,7 @@
DefaultComboBoxModel model = new DefaultComboBoxModel();
month.setModel(model);
- Message[] monthMessages =
+ LocalizableMessage[] monthMessages =
{
INFO_CTRL_PANEL_JANUARY.get(),
INFO_CTRL_PANEL_FEBRUARY.get(),
@@ -860,7 +861,7 @@
INFO_CTRL_PANEL_NOVEMBER.get(),
INFO_CTRL_PANEL_DECEMBER.get(),
};
- for (Message msg : monthMessages)
+ for (LocalizableMessage msg : monthMessages)
{
model.addElement(msg.toString());
}
@@ -880,7 +881,7 @@
JLabel[] labels = {lTime, lDay, lMonth, lYear};
JComponent[] comps = {time, day, month, year};
- Message[] inlineHelp =
+ LocalizableMessage[] inlineHelp =
{
INFO_CTRL_PANEL_TASK_TO_SCHEDULE_TIME_TOOLTIP.get(),
null,
@@ -1090,7 +1091,7 @@
gbc.gridwidth = 1;
for (int i=0 ; i<monthDays.length; i++)
{
- monthDays[i] = Utilities.createCheckBox(Message.raw(String.valueOf(i+1)));
+ monthDays[i] = Utilities.createCheckBox(LocalizableMessage.raw(String.valueOf(i+1)));
monthDays[i].setFont(ColorAndFontConstants.inlineHelpFont);
int x = i % 7;
if (x == 0 && i != 0)
@@ -1167,7 +1168,7 @@
lCronMonth};
Component[] comps = {cronMinute, cronHour, cronWeekDay, cronMonthDay,
cronMonth};
- Message[] help =
+ LocalizableMessage[] help =
{
INFO_CTRL_PANEL_CRON_MINUTE_HELP.get(),
INFO_CTRL_PANEL_CRON_HOUR_HELP.get(),
--
Gitblit v1.10.0