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/PromptingTrustManager.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/sdk/src/com/sun/opends/sdk/tools/PromptingTrustManager.java b/sdk/src/com/sun/opends/sdk/tools/PromptingTrustManager.java
index 400ee46..ec74304 100644
--- a/sdk/src/com/sun/opends/sdk/tools/PromptingTrustManager.java
+++ b/sdk/src/com/sun/opends/sdk/tools/PromptingTrustManager.java
@@ -49,8 +49,9 @@
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
-import com.sun.opends.sdk.util.Message;
-import com.sun.opends.sdk.util.MessageBuilder;
+import org.opends.sdk.LocalizableMessage;
+import org.opends.sdk.LocalizableMessageBuilder;
+
import com.sun.opends.sdk.util.Validator;
@@ -84,7 +85,7 @@
private Integer choice;
- private Message msg;
+ private LocalizableMessage msg;
@@ -96,7 +97,7 @@
* @param msg
* the message message.
*/
- private TrustOption(int i, Message msg)
+ private TrustOption(int i, LocalizableMessage msg)
{
choice = i;
this.msg = msg;
@@ -121,7 +122,7 @@
*
* @return the menu message.
*/
- Message getMenuMessage()
+ LocalizableMessage getMenuMessage()
{
return msg;
}
@@ -338,7 +339,7 @@
{
menuOptions.put(t.getChoice().toString(), t);
- MessageBuilder builder = new MessageBuilder();
+ LocalizableMessageBuilder builder = new LocalizableMessageBuilder();
builder.append(t.getChoice());
builder.append(") ");
builder.append(t.getMenuMessage());
@@ -346,7 +347,7 @@
}
TrustOption defaultTrustMethod = TrustOption.SESSION;
- Message promptMsg = INFO_MENU_PROMPT_SINGLE_DEFAULT
+ LocalizableMessage promptMsg = INFO_MENU_PROMPT_SINGLE_DEFAULT
.get(defaultTrustMethod.getChoice().toString());
while (true)
--
Gitblit v1.10.0