From cfc513043c5830b5a967733066068c7097b42e3c Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opendj-sdk/opends/src/server/org/opends/server/admin/server/ServerManagedObject.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/server/ServerManagedObject.java b/opendj-sdk/opends/src/server/org/opends/server/admin/server/ServerManagedObject.java
index ff01987..abe58cc 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/server/ServerManagedObject.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/server/ServerManagedObject.java
@@ -26,11 +26,11 @@
*/
package org.opends.server.admin.server;
+import org.opends.messages.Message;
import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.StaticUtils.*;
import java.util.ArrayList;
@@ -82,7 +82,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.messages.AdminMessages;
+import org.opends.messages.AdminMessages;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DN;
@@ -579,18 +579,17 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = AdminMessages.MSGID_ADMIN_CANNOT_GET_MANAGED_OBJECT;
- String message = getMessage(msgID, String.valueOf(dn),
- stackTraceToSingleLineString(e));
- throw new ConfigException(msgID, message, e);
+ Message message = AdminMessages.ERR_ADMIN_CANNOT_GET_MANAGED_OBJECT.get(
+ String.valueOf(dn), stackTraceToSingleLineString(e));
+ throw new ConfigException(message, e);
}
// The configuration handler is free to return null indicating
// that the entry does not exist.
if (configEntry == null) {
- int msgID = AdminMessages.MSGID_ADMIN_MANAGED_OBJECT_DOES_NOT_EXIST;
- String message = getMessage(msgID, String.valueOf(dn));
- throw new ConfigException(msgID, message);
+ Message message = AdminMessages.ERR_ADMIN_MANAGED_OBJECT_DOES_NOT_EXIST.
+ get(String.valueOf(dn));
+ throw new ConfigException(message);
}
return configEntry;
@@ -1238,10 +1237,9 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = AdminMessages.MSGID_ADMIN_CANNOT_GET_LISTENER_BASE;
- String message = getMessage(msgID, String.valueOf(dn),
- stackTraceToSingleLineString(e));
- throw new ConfigException(msgID, message, e);
+ Message message = AdminMessages.ERR_ADMIN_CANNOT_GET_LISTENER_BASE.get(
+ String.valueOf(dn), stackTraceToSingleLineString(e));
+ throw new ConfigException(message, e);
}
return configEntry;
@@ -1285,9 +1283,9 @@
}
// No parent entry could be found.
- int msgID = AdminMessages.MSGID_ADMIN_UNABLE_TO_REGISTER_LISTENER;
- String message = getMessage(msgID, String.valueOf(baseDN));
- throw new ConfigException(msgID, message);
+ Message message = AdminMessages.ERR_ADMIN_UNABLE_TO_REGISTER_LISTENER.get(
+ String.valueOf(baseDN));
+ throw new ConfigException(message);
}
--
Gitblit v1.10.0