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/AbstractManagedObjectDefinition.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java b/opendj3-server-dev/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
index df10832..ec9f288 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.admin;
@@ -42,7 +43,7 @@
import java.util.Set;
import java.util.Vector;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.DefinitionDecodingException.Reason;
@@ -432,7 +433,7 @@
* If this managed object definition is the
* {@link TopCfgDefn}.
*/
- public final Message getDescription() throws UnsupportedOperationException {
+ public final LocalizableMessage getDescription() throws UnsupportedOperationException {
return getDescription(Locale.getDefault());
}
@@ -451,7 +452,7 @@
* If this managed object definition is the
* {@link TopCfgDefn}.
*/
- public final Message getDescription(Locale locale)
+ public final LocalizableMessage getDescription(Locale locale)
throws UnsupportedOperationException {
try {
return ManagedObjectDefinitionI18NResource.getInstance()
@@ -668,7 +669,7 @@
* If this managed object definition is the
* {@link TopCfgDefn}.
*/
- public final Message getSynopsis() throws UnsupportedOperationException {
+ public final LocalizableMessage getSynopsis() throws UnsupportedOperationException {
return getSynopsis(Locale.getDefault());
}
@@ -686,7 +687,7 @@
* If this managed object definition is the
* {@link TopCfgDefn}.
*/
- public final Message getSynopsis(Locale locale)
+ public final LocalizableMessage getSynopsis(Locale locale)
throws UnsupportedOperationException {
return ManagedObjectDefinitionI18NResource.getInstance()
.getMessage(this, "synopsis", locale);
@@ -704,7 +705,7 @@
* If this managed object definition is the
* {@link TopCfgDefn}.
*/
- public final Message getUserFriendlyName()
+ public final LocalizableMessage getUserFriendlyName()
throws UnsupportedOperationException {
return getUserFriendlyName(Locale.getDefault());
}
@@ -723,10 +724,10 @@
* If this managed object definition is the
* {@link TopCfgDefn}.
*/
- public final Message getUserFriendlyName(Locale locale)
+ public final LocalizableMessage getUserFriendlyName(Locale locale)
throws UnsupportedOperationException {
- // TODO: have admin framework getMessage return a Message
- return Message.raw(ManagedObjectDefinitionI18NResource.getInstance()
+ // TODO: have admin framework getMessage return a LocalizableMessage
+ return LocalizableMessage.raw(ManagedObjectDefinitionI18NResource.getInstance()
.getMessage(this, "user-friendly-name", locale));
}
@@ -742,7 +743,7 @@
* If this managed object definition is the
* {@link TopCfgDefn}.
*/
- public final Message getUserFriendlyPluralName()
+ public final LocalizableMessage getUserFriendlyPluralName()
throws UnsupportedOperationException {
return getUserFriendlyPluralName(Locale.getDefault());
}
@@ -761,7 +762,7 @@
* If this managed object definition is the
* {@link TopCfgDefn}.
*/
- public final Message getUserFriendlyPluralName(Locale locale)
+ public final LocalizableMessage getUserFriendlyPluralName(Locale locale)
throws UnsupportedOperationException {
return ManagedObjectDefinitionI18NResource.getInstance()
.getMessage(this, "user-friendly-plural-name", locale);
--
Gitblit v1.10.0