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/server/ConstraintViolationException.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/server/ConstraintViolationException.java b/opendj3-server-dev/src/server/org/opends/server/admin/server/ConstraintViolationException.java
index 960d893..26cb265 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/server/ConstraintViolationException.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/server/ConstraintViolationException.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.opends.server.admin.DecodingException;
import org.forgerock.util.Reject;
@@ -60,7 +60,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());
@@ -76,14 +76,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("; ");
}
@@ -96,7 +96,7 @@
}
// The messages describing the constraint violations that occurred.
- private final Collection<Message> messages;
+ private final Collection<LocalizableMessage> messages;
@@ -113,11 +113,11 @@
* non-empty).
*/
public ConstraintViolationException(ServerManagedObject<?> managedObject,
- Collection<Message> messages) {
+ Collection<LocalizableMessage> messages) {
super(getDefaultMessage(messages));
this.managedObject = managedObject;
- this.messages = new ArrayList<Message>(messages);
+ this.messages = new ArrayList<LocalizableMessage>(messages);
}
@@ -134,7 +134,7 @@
* occurred.
*/
public ConstraintViolationException(ServerManagedObject<?> managedObject,
- Message message) {
+ LocalizableMessage message) {
this(managedObject, Collections.singleton(message));
}
@@ -147,7 +147,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);
}
@@ -160,7 +160,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);
}
--
Gitblit v1.10.0