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/tools/LDAPToolUtils.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/LDAPToolUtils.java b/opends/src/server/org/opends/server/tools/LDAPToolUtils.java
index 3a54aa0..bbc4b5f 100644
--- a/opends/src/server/org/opends/server/tools/LDAPToolUtils.java
+++ b/opends/src/server/org/opends/server/tools/LDAPToolUtils.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.tools;
+import org.opends.messages.Message;
import java.io.File;
import java.io.FileInputStream;
@@ -36,8 +37,7 @@
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.DN;
-import static org.opends.server.messages.MessageHandler.*;
-import static org.opends.server.messages.ToolMessages.*;
+import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -256,8 +256,8 @@
* @param matchedDN The matched DN returned from the server, or
* {@code null} if there was none.
*/
- public static void printErrorMessage(PrintStream err, String explanation,
- int resultCode, String errorMessage,
+ public static void printErrorMessage(PrintStream err, Message explanation,
+ int resultCode, Message errorMessage,
DN matchedDN)
{
if ((explanation != null) && (explanation.length() > 0))
@@ -267,18 +267,18 @@
if (resultCode >= 0)
{
- err.println(getMessage(MSGID_TOOL_RESULT_CODE, resultCode,
+ err.println(ERR_TOOL_RESULT_CODE.get(resultCode,
LDAPResultCode.toString(resultCode)));
}
if ((errorMessage != null) && (errorMessage.length() > 0))
{
- err.println(getMessage(MSGID_TOOL_ERROR_MESSAGE, errorMessage));
+ err.println(ERR_TOOL_ERROR_MESSAGE.get(errorMessage));
}
if (matchedDN != null)
{
- err.println(getMessage(MSGID_TOOL_MATCHED_DN, matchedDN.toString()));
+ err.println(ERR_TOOL_MATCHED_DN.get(matchedDN.toString()));
}
}
}
--
Gitblit v1.10.0