From 19f32e8b95817bcc2ef0a73bbcb4be16e101c989 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 02 Dec 2013 11:07:17 +0000
Subject: [PATCH] OpenDJ 3 : config framework
---
opendj-admin/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/opendj-admin/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java b/opendj-admin/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java
index 4d9b598..3183ece 100644
--- a/opendj-admin/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java
+++ b/opendj-admin/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java
@@ -29,17 +29,18 @@
-import static org.opends.messages.AdminMessages.*;
+import static com.forgerock.opendj.ldap.AdminMessages.*;
import java.util.ArrayList;
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.OperationsException;
import org.opends.server.admin.PropertyIsMandatoryException;
-import org.opends.server.util.Validator;
+
+import com.forgerock.opendj.util.Validator;
@@ -58,16 +59,16 @@
// Create the message.
- private static Message createMessage(
+ private static LocalizableMessage createMessage(
Collection<PropertyIsMandatoryException> causes) {
Validator.ensureNotNull(causes);
- Validator.ensureTrue(!causes.isEmpty());
+ Validator.ensureTrue(!causes.isEmpty(), "causes should not be empty");
if (causes.size() == 1) {
return ERR_MISSING_MANDATORY_PROPERTIES_EXCEPTION_SINGLE.get(causes
.iterator().next().getPropertyDefinition().getName());
} else {
- MessageBuilder builder = new MessageBuilder();
+ LocalizableMessageBuilder builder = new LocalizableMessageBuilder();
boolean isFirst = true;
for (PropertyIsMandatoryException cause : causes) {
@@ -92,7 +93,7 @@
// The user friendly name of the component that caused this
// exception.
- private final Message ufn;
+ private final LocalizableMessage ufn;
@@ -110,7 +111,7 @@
* Indicates whether the exception occurred during managed
* object creation.
*/
- public MissingMandatoryPropertiesException(Message ufn,
+ public MissingMandatoryPropertiesException(LocalizableMessage ufn,
Collection<PropertyIsMandatoryException> causes, boolean isCreate) {
super(createMessage(causes));
@@ -153,7 +154,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