From 1b9f39db0f5450de6c3bb97cec681c342fff5944 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Tue, 08 Dec 2009 10:52:42 +0000
Subject: [PATCH] Move Message/MessageBuilder/LocalizableException/LocalizableIllegalArgumentException to public API since other public API elements reference them. Prefix Message/MessageBuilder with Localizable to emphasize that these classes are I18N related and not protocol messages. Keep MessageDescriptor private since users should not need access to it for now.
---
sdk/src/com/sun/opends/sdk/tools/LDAPPasswordModify.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/sdk/src/com/sun/opends/sdk/tools/LDAPPasswordModify.java b/sdk/src/com/sun/opends/sdk/tools/LDAPPasswordModify.java
index 437698a..ee016b4 100644
--- a/sdk/src/com/sun/opends/sdk/tools/LDAPPasswordModify.java
+++ b/sdk/src/com/sun/opends/sdk/tools/LDAPPasswordModify.java
@@ -12,7 +12,6 @@
import org.opends.sdk.extensions.PasswordModifyRequest;
import org.opends.sdk.extensions.PasswordModifyResult;
-import com.sun.opends.sdk.util.Message;
@@ -105,7 +104,7 @@
{
// Create the command-line argument parser for use with this
// program.
- Message toolDescription = INFO_LDAPPWMOD_TOOL_DESCRIPTION.get();
+ LocalizableMessage toolDescription = INFO_LDAPPWMOD_TOOL_DESCRIPTION.get();
ArgumentParser argParser =
new ArgumentParser(LDAPPasswordModify.class.getName(), toolDescription,
false);
@@ -211,7 +210,7 @@
}
catch (ArgumentException ae)
{
- Message message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
+ LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
println(message);
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
@@ -224,7 +223,7 @@
}
catch (ArgumentException ae)
{
- Message message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
+ LocalizableMessage message = ERR_ERROR_PARSING_ARGS.get(ae.getMessage());
println(message);
println(argParser.getUsageMessage());
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
@@ -266,7 +265,7 @@
}
catch (DecodeException de)
{
- Message message =
+ LocalizableMessage message =
ERR_TOOL_INVALID_CONTROL_STRING.get(ctrlString);
println(message);
ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
@@ -276,7 +275,7 @@
if (newPW.isPresent() && newPWFile.isPresent())
{
- Message message = ERR_LDAPPWMOD_CONFLICTING_ARGS.get(
+ LocalizableMessage message = ERR_LDAPPWMOD_CONFLICTING_ARGS.get(
newPW.getLongIdentifier(),
newPWFile.getLongIdentifier());
println(message);
@@ -285,7 +284,7 @@
if (currentPW.isPresent() && currentPWFile.isPresent())
{
- Message message = ERR_LDAPPWMOD_CONFLICTING_ARGS.get(
+ LocalizableMessage message = ERR_LDAPPWMOD_CONFLICTING_ARGS.get(
currentPW.getLongIdentifier(),
currentPWFile.getLongIdentifier());
println(message);
@@ -344,7 +343,7 @@
}
catch (ErrorResultException e)
{
- Message message =
+ LocalizableMessage message =
ERR_LDAPPWMOD_FAILED.get(e.getResult().getResultCode().intValue(),
e.getResult().getResultCode().toString());
println(message);
@@ -365,7 +364,7 @@
return e.getResult().getResultCode().intValue();
}
- Message message = INFO_LDAPPWMOD_SUCCESSFUL.get();
+ LocalizableMessage message = INFO_LDAPPWMOD_SUCCESSFUL.get();
println(message);
String additionalInfo = result.getDiagnosticMessage();
--
Gitblit v1.10.0