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/server/org/opends/server/config/ConfigAttribute.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/ConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/ConfigAttribute.java
index 4cd8ff5..66f55bca 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/ConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/ConfigAttribute.java
@@ -22,9 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.config;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
@@ -75,7 +76,7 @@
private LinkedHashSet<AttributeValue> pendingValues;
// The description for this configuration attribute.
- private Message description;
+ private LocalizableMessage description;
// The name for this configuration attribute.
private String name;
@@ -98,7 +99,7 @@
* configuration attribute require administrative
* action before they will take effect.
*/
- protected ConfigAttribute(String name, Message description,
+ protected ConfigAttribute(String name, LocalizableMessage description,
boolean isRequired, boolean isMultiValued,
boolean requiresAdminAction)
{
@@ -131,7 +132,7 @@
* @param activeValues The set of values for this attribute that are
* currently active.
*/
- protected ConfigAttribute(String name, Message description,
+ protected ConfigAttribute(String name, LocalizableMessage description,
boolean isRequired, boolean isMultiValued,
boolean requiresAdminAction,
LinkedHashSet<AttributeValue> activeValues)
@@ -181,7 +182,7 @@
* <CODE>null</CODE> if changes will take effect
* immediately.
*/
- protected ConfigAttribute(String name, Message description,
+ protected ConfigAttribute(String name, LocalizableMessage description,
boolean isRequired, boolean isMultiValued,
boolean requiresAdminAction,
LinkedHashSet<AttributeValue> activeValues,
@@ -241,7 +242,7 @@
* @return The description for this configuration attribute, or
* <CODE>null</CODE> if there is no description.
*/
- public Message getDescription()
+ public LocalizableMessage getDescription()
{
return description;
}
@@ -402,7 +403,7 @@
{
if (isRequired)
{
- Message message = ERR_CONFIG_ATTR_IS_REQUIRED.get(name);
+ LocalizableMessage message = ERR_CONFIG_ATTR_IS_REQUIRED.get(name);
throw new ConfigException(message);
}
else
@@ -447,7 +448,7 @@
if (! valueIsAcceptable(value, rejectReason))
{
- Message message = ERR_CONFIG_ATTR_REJECTED_VALUE.get(
+ LocalizableMessage message = ERR_CONFIG_ATTR_REJECTED_VALUE.get(
value.getValue().toString(), name, rejectReason.toString());
throw new ConfigException(message);
}
@@ -457,7 +458,7 @@
// provided, then reject it.
if ((! isMultiValued) && iterator.hasNext())
{
- Message message = ERR_CONFIG_ATTR_SET_VALUES_IS_SINGLE_VALUED.get(name);
+ LocalizableMessage message = ERR_CONFIG_ATTR_SET_VALUES_IS_SINGLE_VALUED.get(name);
throw new ConfigException(message);
}
@@ -468,7 +469,7 @@
value = iterator.next();
if (! valueIsAcceptable(value, rejectReason))
{
- Message message = ERR_CONFIG_ATTR_REJECTED_VALUE.get(
+ LocalizableMessage message = ERR_CONFIG_ATTR_REJECTED_VALUE.get(
value.getValue().toString(), name, rejectReason.toString());
throw new ConfigException(message);
}
@@ -557,7 +558,7 @@
if ((numValues > 1) || (hasPendingValues && (pendingValues.size() > 0)) ||
((! hasPendingValues) && (activeValues.size() > 0)))
{
- Message message = ERR_CONFIG_ATTR_ADD_VALUES_IS_SINGLE_VALUED.get(name);
+ LocalizableMessage message = ERR_CONFIG_ATTR_ADD_VALUES_IS_SINGLE_VALUED.get(name);
throw new ConfigException(message);
}
}
@@ -587,14 +588,14 @@
{
if (tempValues.contains(value))
{
- Message message = ERR_CONFIG_ATTR_ADD_VALUES_ALREADY_EXISTS.get(
+ LocalizableMessage message = ERR_CONFIG_ATTR_ADD_VALUES_ALREADY_EXISTS.get(
name, value.getValue().toString());
throw new ConfigException(message);
}
if (! valueIsAcceptable(value, rejectReason))
{
- Message message = ERR_CONFIG_ATTR_REJECTED_VALUE.get(
+ LocalizableMessage message = ERR_CONFIG_ATTR_REJECTED_VALUE.get(
value.getValue().toString(), name, rejectReason.toString());
throw new ConfigException(message);
}
@@ -655,7 +656,7 @@
{
if (! tempValues.remove(value))
{
- Message message =
+ LocalizableMessage message =
ERR_CONFIG_ATTR_NO_SUCH_VALUE.get(name, value.getValue().toString());
throw new ConfigException(message);
}
@@ -666,7 +667,7 @@
// least one value.
if (isRequired && tempValues.isEmpty())
{
- Message message = ERR_CONFIG_ATTR_IS_REQUIRED.get(name);
+ LocalizableMessage message = ERR_CONFIG_ATTR_IS_REQUIRED.get(name);
throw new ConfigException(message);
}
@@ -699,7 +700,7 @@
{
if (isRequired)
{
- Message message = ERR_CONFIG_ATTR_IS_REQUIRED.get(name);
+ LocalizableMessage message = ERR_CONFIG_ATTR_IS_REQUIRED.get(name);
throw new ConfigException(message);
}
--
Gitblit v1.10.0