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/AbstractVLVIndexPanel.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
index ba0a2e2..048ba0e 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
@@ -74,7 +74,7 @@
import org.opends.guitools.controlpanel.ui.renderer.VLVSortOrderRenderer;
import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.DefinedDefaultBehaviorProvider;
import org.opends.server.admin.std.meta.LocalDBVLVIndexCfgDefn;
import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn.IndexType;
@@ -100,8 +100,8 @@
/**
* Title panel.
*/
- protected TitlePanel titlePanel = new TitlePanel(Message.EMPTY,
- Message.EMPTY);
+ protected TitlePanel titlePanel = new TitlePanel(LocalizableMessage.EMPTY,
+ LocalizableMessage.EMPTY);
/**
* Name label.
*/
@@ -240,29 +240,29 @@
/**
* Other base DN message.
*/
- protected final Message OTHER_BASE_DN =
+ protected final LocalizableMessage OTHER_BASE_DN =
INFO_CTRL_PANEL_VLV_OTHER_BASE_DN_LABEL.get();
/**
* Ascending message.
*/
- protected final Message ASCENDING =
+ protected final LocalizableMessage ASCENDING =
INFO_CTRL_PANEL_VLV_ASCENDING_LABEL.get();
/**
* Descending message.
*/
- protected final Message DESCENDING =
+ protected final LocalizableMessage DESCENDING =
INFO_CTRL_PANEL_VLV_DESCENDING_LABEL.get();
/**
* Custom attributes message.
*/
- protected Message CUSTOM_ATTRIBUTES =
+ protected LocalizableMessage CUSTOM_ATTRIBUTES =
INFO_CTRL_PANEL_CUSTOM_ATTRIBUTES_LABEL.get();
/**
* Standard attributes message.
*/
- protected Message STANDARD_ATTRIBUTES =
+ protected LocalizableMessage STANDARD_ATTRIBUTES =
INFO_CTRL_PANEL_STANDARD_ATTRIBUTES_LABEL.get();
/**
@@ -591,12 +591,12 @@
try
{
LDAPFilter ldapFilter = LDAPFilter.decode(f);
- ArrayList<Message> msgs = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> msgs = new ArrayList<LocalizableMessage>();
updateIndexRequiredMessages(ldapFilter, msgs);
if (!msgs.isEmpty())
{
StringBuilder sb = new StringBuilder();
- for (Message msg : msgs)
+ for (LocalizableMessage msg : msgs)
{
sb.append("<br>-"+msg);
}
@@ -623,7 +623,7 @@
* @param msgs the list of messages to be updated.
*/
private void updateIndexRequiredMessages(RawFilter filter,
- Collection<Message> msgs)
+ Collection<LocalizableMessage> msgs)
{
switch (filter.getFilterType())
{
@@ -650,7 +650,7 @@
IndexType.ORDERING, IndexType.ORDERING, IndexType.PRESENCE,
IndexType.APPROXIMATE, null
};
- Message[] indexTypeNames = {INFO_CTRL_PANEL_VLV_INDEX_EQUALITY_TYPE.get(),
+ LocalizableMessage[] indexTypeNames = {INFO_CTRL_PANEL_VLV_INDEX_EQUALITY_TYPE.get(),
INFO_CTRL_PANEL_VLV_INDEX_SUBSTRING_TYPE.get(),
INFO_CTRL_PANEL_VLV_INDEX_ORDERING_TYPE.get(),
INFO_CTRL_PANEL_VLV_INDEX_ORDERING_TYPE.get(),
@@ -677,7 +677,7 @@
}
else
{
- Message type = indexTypeNames[i];
+ LocalizableMessage type = indexTypeNames[i];
if (type != null)
{
msgs.add(INFO_CTRL_PANEL_MUST_DEFINE_INDEX_TYPE.get(
@@ -749,7 +749,7 @@
* @param checkName whether the name of the VLV index must be checked or not.
* @return a list containing the error messages found.
*/
- protected List<Message> checkErrors(boolean checkName)
+ protected List<LocalizableMessage> checkErrors(boolean checkName)
{
for (JLabel l : labels)
{
@@ -758,7 +758,7 @@
BackendDescriptor backend = getBackend();
- ArrayList<Message> errors = new ArrayList<Message>();
+ ArrayList<LocalizableMessage> errors = new ArrayList<LocalizableMessage>();
if (checkName)
{
String n = name.getText();
--
Gitblit v1.10.0