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/dsconfig/ConsoleApplication.java | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/ConsoleApplication.java b/opends/src/server/org/opends/server/tools/dsconfig/ConsoleApplication.java
index d8ba680..e197ce2 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/ConsoleApplication.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/ConsoleApplication.java
@@ -25,11 +25,11 @@
* Portions Copyright 2007 Sun Microsystems, Inc.
*/
package org.opends.server.tools.dsconfig;
+import org.opends.messages.Message;
+import org.opends.messages.MessageBuilder;
-
-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.*;
@@ -138,16 +138,18 @@
* If the user's response could not be read from the
* console for some reason.
*/
- public final boolean confirmAction(String prompt) throws ArgumentException {
+ public final boolean confirmAction(Message prompt) throws ArgumentException {
if (!isInteractive()) {
return true;
}
- final String yes = getMessage(MSGID_DSCFG_GENERAL_CONFIRM_YES);
- final String no = getMessage(MSGID_DSCFG_GENERAL_CONFIRM_NO);
- final String errMsg =
- getMessage(MSGID_DSCFG_ERROR_GENERAL_CONFIRM, yes, no);
- prompt = prompt + String.format(" (%s / %s): ", yes, no);
+ final Message yes = INFO_DSCFG_GENERAL_CONFIRM_YES.get();
+ final Message no = INFO_DSCFG_GENERAL_CONFIRM_NO.get();
+ final Message errMsg = ERR_DSCFG_ERROR_GENERAL_CONFIRM.get(yes, no);
+ MessageBuilder mb = new MessageBuilder();
+ mb.append(prompt);
+ mb.append(String.format(" (%s / %s): ", yes, no));
+ prompt = mb.toMessage();
ValidationCallback<Boolean> validator = new ValidationCallback<Boolean>() {
@@ -157,9 +159,9 @@
// Empty input.
app.println();
app.printMessage(errMsg);
- } else if (no.startsWith(ninput)) {
+ } else if (no.toString().startsWith(ninput)) {
return false;
- } else if (yes.startsWith(ninput)) {
+ } else if (yes.toString().startsWith(ninput)) {
return true;
} else {
// Try again...
@@ -187,8 +189,8 @@
* @param msg
* The message.
*/
- public final void printMessage(String msg) {
- err.println(wrapText(msg, MAX_LINE_WIDTH));
+ public final void printMessage(Message msg) {
+ err.println(wrapText(msg.toString(), MAX_LINE_WIDTH));
}
@@ -209,7 +211,7 @@
* @param msg
* The verbose message.
*/
- public final void printVerboseMessage(String msg) {
+ public final void printVerboseMessage(Message msg) {
if (isVerbose() || isInteractive()) {
err.println(wrapText(msg, MAX_LINE_WIDTH));
}
@@ -330,8 +332,9 @@
* If the user input could not be retrieved for some
* reason.
*/
- public final <T> T readChoice(final String prompt, List<String> descriptions,
- List<T> values, final HelpCallback helpCallback)
+ public final <T> T readChoice(
+ final Message prompt, List<Message> descriptions,
+ List<T> values, final HelpCallback helpCallback)
throws ArgumentException {
Validator.ensureTrue(descriptions.size() == values.size());
@@ -356,11 +359,11 @@
builder.print(printer);
// Get the user input.
- String promptMsg;
+ Message promptMsg;
if (helpCallback != null) {
- promptMsg = getMessage(MSGID_DSCFG_GENERAL_CHOICE_PROMPT_HELP, size);
+ promptMsg = INFO_DSCFG_GENERAL_CHOICE_PROMPT_HELP.get(size);
} else {
- promptMsg = getMessage(MSGID_DSCFG_GENERAL_CHOICE_PROMPT_NOHELP, size);
+ promptMsg = INFO_DSCFG_GENERAL_CHOICE_PROMPT_NOHELP.get(size);
}
ValidationCallback<Integer> validator = new ValidationCallback<Integer>() {
@@ -388,7 +391,7 @@
return i;
} catch (NumberFormatException e) {
app.println();
- String errMsg = getMessage(MSGID_DSCFG_ERROR_GENERAL_CHOICE, size);
+ Message errMsg = ERR_DSCFG_ERROR_GENERAL_CHOICE.get(size);
app.printMessage(errMsg);
return null;
}
@@ -420,9 +423,9 @@
* If the line of input could not be retrieved for some
* reason.
*/
- public final String readLineOfInput(String prompt) throws ArgumentException {
+ public final String readLineOfInput(Message prompt) throws ArgumentException {
err.println();
- err.print(wrapText(prompt.trim() + " ", MAX_LINE_WIDTH));
+ err.print(wrapText(prompt.toString().trim() + " ", MAX_LINE_WIDTH));
try {
return in.readLine();
} catch (IOException e) {
@@ -441,7 +444,7 @@
* @throws ArgumentException
* If the password could not be retrieved for some reason.
*/
- public final String readPassword(String prompt) throws ArgumentException {
+ public final String readPassword(Message prompt) throws ArgumentException {
err.print(wrapText(prompt + " ", MAX_LINE_WIDTH));
char[] pwChars;
try {
@@ -474,7 +477,7 @@
* If an unexpected error occurred which prevented
* validation.
*/
- public final <T> T readValidatedInput(String prompt,
+ public final <T> T readValidatedInput(Message prompt,
ValidationCallback<T> validator) throws ArgumentException,
ClientException {
while (true) {
--
Gitblit v1.10.0