From 80c58327faaa4873369f6bb949e62792c2f708e0 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.
---
opends/src/server/org/opends/server/core/NetworkGroup.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/NetworkGroup.java b/opends/src/server/org/opends/server/core/NetworkGroup.java
index a510884..3cda3de 100644
--- a/opends/src/server/org/opends/server/core/NetworkGroup.java
+++ b/opends/src/server/org/opends/server/core/NetworkGroup.java
@@ -25,10 +25,8 @@
* Portions Copyright 2007 Sun Microsystems, Inc.
*/
package org.opends.server.core;
-
-
-import static org.opends.server.messages.CoreMessages.*;
-import static org.opends.server.messages.MessageHandler.getMessage;
+import org.opends.messages.Message;
+import static org.opends.messages.CoreMessages.*;
import static org.opends.server.util.Validator.ensureNotNull;
import java.util.TreeMap;
@@ -124,10 +122,10 @@
// The network group must not be already registered
if (registeredNetworkGroups.containsKey(networkGroupID))
{
- int msgID = MSGID_REGISTER_NETWORK_GROUP_ALREADY_EXISTS;
- String message = getMessage(msgID, networkGroupID);
+ Message message = ERR_REGISTER_NETWORK_GROUP_ALREADY_EXISTS.get(
+ networkGroupID);
throw new DirectoryException(
- ResultCode.UNWILLING_TO_PERFORM, message, msgID);
+ ResultCode.UNWILLING_TO_PERFORM, message);
}
TreeMap<String, NetworkGroup> newRegisteredNetworkGroups =
@@ -341,11 +339,9 @@
/**
* Deregisters a workflow node with the network group.
*
- * @param workflowNode the workflow node to deregister
+ * @param workflow the workflow node to deregister
*/
- private void deregisterWorkflow(
- Workflow workflow
- )
+ private void deregisterWorkflow(Workflow workflow)
{
// true as soon as the workflow has been deregistered
boolean deregistered = false;
@@ -401,10 +397,10 @@
// The workflow must not be already registered
if (registeredWorkflowNodes.containsKey(workflowID))
{
- int msgID = MSGID_REGISTER_WORKFLOW_NODE_ALREADY_EXISTS;
- String message = getMessage(msgID, workflowID, networkGroupID);
+ Message message = ERR_REGISTER_WORKFLOW_NODE_ALREADY_EXISTS.get(
+ workflowID, networkGroupID);
throw new DirectoryException(
- ResultCode.UNWILLING_TO_PERFORM, message, msgID);
+ ResultCode.UNWILLING_TO_PERFORM, message);
}
TreeMap<String, WorkflowTopologyNode> newRegisteredWorkflowNodes =
--
Gitblit v1.10.0