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/BooleanConfigAttribute.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/BooleanConfigAttribute.java b/opendj3-server-dev/src/server/org/opends/server/config/BooleanConfigAttribute.java
index 995b26a..ee74fc4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/BooleanConfigAttribute.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/BooleanConfigAttribute.java
@@ -25,7 +25,7 @@
* Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.config;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
@@ -85,7 +85,7 @@
* configuration attribute require administrative
* action before they will take effect.
*/
- public BooleanConfigAttribute(String name, Message description,
+ public BooleanConfigAttribute(String name, LocalizableMessage description,
boolean requiresAdminAction)
{
super(name, description, true, false, requiresAdminAction);
@@ -107,7 +107,7 @@
* @param value The value for this Boolean configuration
* attribute.
*/
- public BooleanConfigAttribute(String name, Message description,
+ public BooleanConfigAttribute(String name, LocalizableMessage description,
boolean requiresAdminAction,
boolean value)
{
@@ -135,7 +135,7 @@
* @param pendingValue The pending value for this Boolean
* configuration attribute.
*/
- public BooleanConfigAttribute(String name, Message description,
+ public BooleanConfigAttribute(String name, LocalizableMessage description,
boolean requiresAdminAction,
boolean activeValue, boolean pendingValue)
{
@@ -331,7 +331,7 @@
{
if ((valueStrings == null) || valueStrings.isEmpty())
{
- Message message = ERR_CONFIG_ATTR_IS_REQUIRED.get(getName());
+ LocalizableMessage message = ERR_CONFIG_ATTR_IS_REQUIRED.get(getName());
throw new ConfigException(message);
}
@@ -340,7 +340,7 @@
String valueString = iterator.next().toLowerCase();
if (iterator.hasNext())
{
- Message message = ERR_CONFIG_ATTR_IS_REQUIRED.get(getName());
+ LocalizableMessage message = ERR_CONFIG_ATTR_IS_REQUIRED.get(getName());
throw new ConfigException(message);
}
@@ -356,7 +356,7 @@
}
else
{
- Message message =
+ LocalizableMessage message =
ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(getName(), valueString);
throw new ConfigException(message);
}
@@ -451,7 +451,7 @@
if (pendingValueSet)
{
// We cannot have multiple pending values.
- Message message =
+ LocalizableMessage message =
ERR_CONFIG_ATTR_MULTIPLE_PENDING_VALUE_SETS.get(a.getName());
throw new ConfigException(message);
}
@@ -460,7 +460,7 @@
if (a.isEmpty())
{
// This is illegal -- it must have a value.
- Message message = ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getName());
+ LocalizableMessage message = ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getName());
throw new ConfigException(message);
}
else
@@ -485,7 +485,7 @@
else
{
// This is an illegal value.
- Message message = ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(
+ LocalizableMessage message = ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(
getName(), valueString);
throw new ConfigException(message);
}
@@ -493,7 +493,7 @@
if (iterator.hasNext())
{
// This is illegal -- it must be single-valued.
- Message message =
+ LocalizableMessage message =
ERR_CONFIG_ATTR_SET_VALUES_IS_SINGLE_VALUED.get(a.getName());
throw new ConfigException(message);
}
@@ -503,7 +503,7 @@
{
// This is illegal -- only the pending option is allowed for
// configuration attributes.
- Message message =
+ LocalizableMessage message =
ERR_CONFIG_ATTR_OPTIONS_NOT_ALLOWED.get(a.getName());
throw new ConfigException(message);
}
@@ -514,7 +514,7 @@
if (activeValueSet)
{
// We cannot have multiple active values.
- Message message =
+ LocalizableMessage message =
ERR_CONFIG_ATTR_MULTIPLE_ACTIVE_VALUE_SETS.get(a.getName());
throw new ConfigException(message);
}
@@ -523,7 +523,7 @@
if (a.isEmpty())
{
// This is illegal -- it must have a value.
- Message message = ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getName());
+ LocalizableMessage message = ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getName());
throw new ConfigException(message);
}
else
@@ -548,7 +548,7 @@
else
{
// This is an illegal value.
- Message message = ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(
+ LocalizableMessage message = ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(
getName(), valueString);
throw new ConfigException(message);
}
@@ -556,7 +556,7 @@
if (iterator.hasNext())
{
// This is illegal -- it must be single-valued.
- Message message =
+ LocalizableMessage message =
ERR_CONFIG_ATTR_SET_VALUES_IS_SINGLE_VALUED.get(a.getName());
throw new ConfigException(message);
}
@@ -567,7 +567,7 @@
if (! activeValueSet)
{
// This is not OK. The value set must contain an active value.
- Message message = ERR_CONFIG_ATTR_NO_ACTIVE_VALUE_SET.get(getName());
+ LocalizableMessage message = ERR_CONFIG_ATTR_NO_ACTIVE_VALUE_SET.get(getName());
throw new ConfigException(message);
}
@@ -720,14 +720,14 @@
}
else
{
- Message message =
+ LocalizableMessage message =
ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(getName(), stringValue);
throw new ConfigException(message);
}
}
else
{
- Message message = ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(
+ LocalizableMessage message = ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(
getName(), value.getClass().getName() + ":" +
String.valueOf(value));
throw new ConfigException(message);
--
Gitblit v1.10.0