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/ConsoleApplication.java |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/sdk/src/com/sun/opends/sdk/tools/ConsoleApplication.java b/sdk/src/com/sun/opends/sdk/tools/ConsoleApplication.java
index d21f6da..06f77e2 100755
--- a/sdk/src/com/sun/opends/sdk/tools/ConsoleApplication.java
+++ b/sdk/src/com/sun/opends/sdk/tools/ConsoleApplication.java
@@ -35,7 +35,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.sun.opends.sdk.util.Message;
+import org.opends.sdk.LocalizableMessage;
+
 
 
 
@@ -357,7 +358,7 @@
    */
   final void pressReturnToContinue()
   {
-    Message msg = INFO_MENU_PROMPT_RETURN_TO_CONTINUE.get();
+    LocalizableMessage msg = INFO_MENU_PROMPT_RETURN_TO_CONTINUE.get();
     try
     {
       readLineOfInput(msg);
@@ -386,7 +387,7 @@
    * @param msg
    *          The message.
    */
-  final void println(Message msg)
+  final void println(LocalizableMessage msg)
   {
     err.println(wrapText(msg, MAX_LINE_WIDTH));
   }
@@ -399,7 +400,7 @@
    * @param msg
    *          The message.
    */
-  final void print(Message msg)
+  final void print(LocalizableMessage msg)
   {
     err.print(wrapText(msg, MAX_LINE_WIDTH));
   }
@@ -427,7 +428,7 @@
    * @param msg
    *          The message.
    */
-  final void printProgress(Message msg)
+  final void printProgress(LocalizableMessage msg)
   {
     if (!isQuiet())
     {
@@ -446,7 +447,7 @@
    * @param indent
    *          The number of columns to indent.
    */
-  final void println(Message msg, int indent)
+  final void println(LocalizableMessage msg, int indent)
   {
     err.println(wrapText(msg, MAX_LINE_WIDTH, indent));
   }
@@ -459,7 +460,7 @@
    * @param msg
    *          The verbose message.
    */
-  final void printVerboseMessage(Message msg)
+  final void printVerboseMessage(LocalizableMessage msg)
   {
     if (isVerbose() || isInteractive())
     {
@@ -480,7 +481,7 @@
    *           If the line of input could not be retrieved for some
    *           reason.
    */
-  final String readLineOfInput(Message prompt) throws CLIException
+  final String readLineOfInput(LocalizableMessage prompt) throws CLIException
   {
     if (prompt != null)
     {
@@ -526,7 +527,7 @@
    *           reason.
    * @return The string value read from the user.
    */
-  final String readInput(Message prompt, String defaultValue)
+  final String readInput(LocalizableMessage prompt, String defaultValue)
       throws CLIException
   {
     while (true)
@@ -576,7 +577,7 @@
    *          the Logger to be used to log the error message.
    * @return The string value read from the user.
    */
-  final String readInput(Message prompt, String defaultValue,
+  final String readInput(LocalizableMessage prompt, String defaultValue,
       Logger logger)
   {
     String s = defaultValue;

--
Gitblit v1.10.0