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/admin/client/OperationRejectedException.java |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/client/OperationRejectedException.java b/opendj3-server-dev/src/server/org/opends/server/admin/client/OperationRejectedException.java
index c6e314e..75ecb2d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/client/OperationRejectedException.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/client/OperationRejectedException.java
@@ -35,8 +35,8 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import org.opends.messages.Message;
-import org.opends.messages.MessageBuilder;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizableMessageBuilder;
 import org.forgerock.util.Reject;
 
 
@@ -84,7 +84,7 @@
 
 
   // Gets the default message.
-  private static Message getDefaultMessage(Collection<Message> messages) {
+  private static LocalizableMessage getDefaultMessage(Collection<LocalizableMessage> messages) {
     Reject.ifNull(messages);
     Reject.ifFalse(!messages.isEmpty());
 
@@ -100,14 +100,14 @@
 
 
   // Merge the messages into a single message.
-  private static Message getSingleMessage(Collection<Message> messages) {
+  private static LocalizableMessage getSingleMessage(Collection<LocalizableMessage> messages) {
     if (messages.size() == 1) {
       return messages.iterator().next();
     } else {
-      MessageBuilder builder = new MessageBuilder();
+      LocalizableMessageBuilder builder = new LocalizableMessageBuilder();
 
       boolean isFirst = true;
-      for (Message m : messages) {
+      for (LocalizableMessage m : messages) {
         if (!isFirst) {
           builder.append(";  ");
         }
@@ -120,14 +120,14 @@
   }
 
   // The messages describing the constraint violations that occurred.
-  private final Collection<Message> messages;
+  private final Collection<LocalizableMessage> messages;
 
   // The type of operation that caused this exception.
   private final OperationType type;
 
   // The user friendly name of the component that caused this
   // exception.
-  private final Message ufn;
+  private final LocalizableMessage ufn;
 
 
 
@@ -141,7 +141,7 @@
    *          The user friendly name of the component that caused this
    *          exception.
    */
-  public OperationRejectedException(OperationType type, Message ufn) {
+  public OperationRejectedException(OperationType type, LocalizableMessage ufn) {
     this(type, ufn, ERR_OPERATION_REJECTED_DEFAULT.get());
   }
 
@@ -161,11 +161,11 @@
    *          occurred (must be non-<code>null</code> and
    *          non-empty).
    */
-  public OperationRejectedException(OperationType type, Message ufn,
-      Collection<Message> messages) {
+  public OperationRejectedException(OperationType type, LocalizableMessage ufn,
+      Collection<LocalizableMessage> messages) {
     super(getDefaultMessage(messages));
 
-    this.messages = new ArrayList<Message>(messages);
+    this.messages = new ArrayList<LocalizableMessage>(messages);
     this.type = type;
     this.ufn = ufn;
   }
@@ -185,8 +185,8 @@
    *          The message describing the constraint violation that
    *          occurred.
    */
-  public OperationRejectedException(OperationType type, Message ufn,
-      Message message) {
+  public OperationRejectedException(OperationType type, LocalizableMessage ufn,
+      LocalizableMessage message) {
     this(type, ufn, Collections.singleton(message));
   }
 
@@ -199,7 +199,7 @@
    * @return Returns an unmodifiable collection view of the messages
    *         describing the constraint violations that occurred.
    */
-  public Collection<Message> getMessages() {
+  public Collection<LocalizableMessage> getMessages() {
     return Collections.unmodifiableCollection(messages);
   }
 
@@ -212,7 +212,7 @@
    * @return Returns a single message listing all the messages
    *         combined into a single list separated by semi-colons.
    */
-  public Message getMessagesAsSingleMessage() {
+  public LocalizableMessage getMessagesAsSingleMessage() {
     return getSingleMessage(messages);
   }
 
@@ -236,7 +236,7 @@
    * @return Returns the user friendly name of the component that
    *         caused this exception.
    */
-  public Message getUserFriendlyName() {
+  public LocalizableMessage getUserFriendlyName() {
     return ufn;
   }
 

--
Gitblit v1.10.0