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/plugins/UniqueAttributePlugin.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
index 3ca37d7..33db1ce 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -29,7 +29,7 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
 import org.opends.server.admin.server.ConfigurationChangeListener;
 import org.opends.server.admin.std.meta.PluginCfgDefn;
 import org.opends.server.admin.std.server.PluginCfg;
@@ -127,7 +127,7 @@
           break;
 
         default:
-          Message message =
+          LocalizableMessage message =
                   ERR_PLUGIN_UNIQUEATTR_INVALID_PLUGIN_TYPE.get(t.toString());
           throw new ConfigException(message);
 
@@ -325,7 +325,7 @@
         {
           uniqueAttrValue2Dn.remove(v2);
         }
-        Message msg = ERR_PLUGIN_UNIQUEATTR_ATTR_NOT_UNIQUE.get(
+        LocalizableMessage msg = ERR_PLUGIN_UNIQUEATTR_ATTR_NOT_UNIQUE.get(
             t.getNameOrOID(), v.getValue().toString(),
             conflictDN.toString());
         return PluginResult.PreOperation.stopProcessing(
@@ -339,7 +339,7 @@
         TRACER.debugCaught(DebugLogLevel.ERROR, de);
       }
 
-      Message message =
+      LocalizableMessage message =
           ERR_PLUGIN_UNIQUEATTR_INTERNAL_ERROR.get(
                              de.getResultCode().toString(),
                              de.getMessageObject());
@@ -558,7 +558,7 @@
       }
       if (conflictDN != null)
       {
-        Message message = ERR_PLUGIN_UNIQUEATTR_SYNC_NOT_UNIQUE.get(
+        LocalizableMessage message = ERR_PLUGIN_UNIQUEATTR_SYNC_NOT_UNIQUE.get(
                                t.getNameOrOID(),
                                operation.getConnectionID(),
                                operation.getOperationID(),
@@ -577,7 +577,7 @@
         TRACER.debugCaught(DebugLogLevel.ERROR, de);
       }
 
-      Message message = ERR_PLUGIN_UNIQUEATTR_INTERNAL_ERROR_SYNC.get(
+      LocalizableMessage message = ERR_PLUGIN_UNIQUEATTR_INTERNAL_ERROR_SYNC.get(
                             operation.getConnectionID(),
                             operation.getOperationID(),
                             updatedEntryDN.toString(),
@@ -706,7 +706,7 @@
    */
   @Override()
   public boolean isConfigurationAcceptable(PluginCfg configuration,
-                                           List<Message> unacceptableReasons)
+                                           List<LocalizableMessage> unacceptableReasons)
   {
     UniqueAttributePluginCfg cfg = (UniqueAttributePluginCfg) configuration;
     return isConfigurationChangeAcceptable(cfg, unacceptableReasons);
@@ -720,7 +720,7 @@
   @Override
   public boolean isConfigurationChangeAcceptable(
                       UniqueAttributePluginCfg configuration,
-                      List<Message> unacceptableReasons)
+                      List<LocalizableMessage> unacceptableReasons)
   {
     boolean configAcceptable = true;
 
@@ -741,7 +741,7 @@
           break;
 
         default:
-          Message message = ERR_PLUGIN_UNIQUEATTR_INVALID_PLUGIN_TYPE.get(
+          LocalizableMessage message = ERR_PLUGIN_UNIQUEATTR_INVALID_PLUGIN_TYPE.get(
                                  pluginType.toString());
           unacceptableReasons.add(message);
           configAcceptable = false;

--
Gitblit v1.10.0