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/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java | 147 ++++++++++++++++++++-----------------------------
1 files changed, 60 insertions(+), 87 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
index b34331b..725c60f 100644
--- a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -28,7 +28,6 @@
package org.opends.guitools.uninstaller;
import org.opends.admin.ads.util.ApplicationTrustManager;
-import org.opends.guitools.i18n.ResourceProvider;
import org.opends.quicksetup.*;
import org.opends.quicksetup.util.Utils;
import org.opends.server.util.args.Argument;
@@ -41,6 +40,10 @@
import java.util.logging.Logger;
import java.io.IOException;
+import org.opends.messages.Message;
+import static org.opends.messages.AdminToolMessages.*;
+
+
/**
* The class used to provide some CLI interface in the uninstall.
*
@@ -56,8 +59,6 @@
static private final Logger LOG =
Logger.getLogger(UninstallCliHelper.class.getName());
- static private String FORMAT_KEY = "cli-uninstall-confirm-prompt";
-
/**
* Creates a UserData based in the arguments provided. It asks
* user for additional information if what is provided in the arguments is not
@@ -91,7 +92,7 @@
}
catch (ArgumentException ae)
{
- throw new UserDataException(null, ae.getLocalizedMessage());
+ throw new UserDataException(null, ae.getMessageObject());
}
Argument interactive = args.getArgumentForLongID(INTERACTIVE_OPTION_LONG);
@@ -158,15 +159,6 @@
}
/**
- * Gets the resource provider instance.
- * @return ResourceProvider instance
- */
- protected ResourceProvider getI18n()
- {
- return ResourceProvider.getInstance();
- }
-
- /**
* Commodity method used to ask the user to confirm the deletion of certain
* parts of the server. It updates the provided UserData object
* accordingly. Returns <CODE>true</CODE> if the user cancels and <CODE>
@@ -183,11 +175,15 @@
Set<String> outsideDbs, Set<String> outsideLogs)
{
boolean cancelled = false;
-
- String answer = promptConfirm(FORMAT_KEY,
- getMsg("cli-uninstall-what-to-delete"),
- "1", new String[] {"1", "2", "3"});
- if ("3".equals(answer))
+ Message[] options = new Message[] {
+ Message.raw("1"),
+ Message.raw("2"),
+ Message.raw("3")
+ };
+ Message answer = promptConfirm(
+ INFO_CLI_UNINSTALL_WHAT_TO_DELETE.get(),
+ options[0], options);
+ if (options[2].equals(answer))
{
cancelled = true;
}
@@ -209,20 +205,27 @@
while (!somethingSelected)
{
// Ask for confirmation for the different items
- String[] keys = {
- "cli-uninstall-confirm-libraries-binaries",
- "cli-uninstall-confirm-databases",
- "cli-uninstall-confirm-logs",
- "cli-uninstall-confirm-configuration-schema",
- "cli-uninstall-confirm-backups",
- "cli-uninstall-confirm-ldifs",
- "cli-uninstall-confirm-outsidedbs",
- "cli-uninstall-confirm-outsidelogs"
+ Message[] keys = {
+ INFO_CLI_UNINSTALL_CONFIRM_LIBRARIES_BINARIES.get(),
+ INFO_CLI_UNINSTALL_CONFIRM_DATABASES.get(),
+ INFO_CLI_UNINSTALL_CONFIRM_LOGS.get(),
+ INFO_CLI_UNINSTALL_CONFIRM_CONFIGURATION_SCHEMA.get(),
+ INFO_CLI_UNINSTALL_CONFIRM_BACKUPS.get(),
+ INFO_CLI_UNINSTALL_CONFIRM_LDIFS.get(),
+ INFO_CLI_UNINSTALL_CONFIRM_OUTSIDEDBS.get(
+ Utils.getStringFromCollection(outsideDbs,
+ Constants.LINE_SEPARATOR)),
+ INFO_CLI_UNINSTALL_CONFIRM_OUTSIDELOGS.get(
+ Utils.getStringFromCollection(outsideLogs,
+ Constants.LINE_SEPARATOR)
+ )
};
- String[] validValues = {
- getMsg("cli-uninstall-yes-long"), getMsg("cli-uninstall-no-long"),
- getMsg("cli-uninstall-yes-short"), getMsg("cli-uninstall-no-short")
+ Message[] validValues = {
+ INFO_CLI_UNINSTALL_YES_LONG.get(),
+ INFO_CLI_UNINSTALL_NO_LONG.get(),
+ INFO_CLI_UNINSTALL_YES_SHORT.get(),
+ INFO_CLI_UNINSTALL_NO_SHORT.get()
};
boolean[] answers = new boolean[keys.length];
for (int i=0; i<keys.length; i++)
@@ -231,30 +234,16 @@
((i == 7) && (outsideLogs.size() == 0));
if (!ignore)
{
- String msg;
- if (i == 6)
- {
- String[] arg = {Utils.getStringFromCollection(outsideDbs,
- Constants.LINE_SEPARATOR)};
- msg = getMsg(keys[i], arg);
- }
- else if (i == 7)
- {
- String[] arg = {Utils.getStringFromCollection(outsideLogs,
- Constants.LINE_SEPARATOR)};
- msg = getMsg(keys[i], arg);
- }
- else
- {
- msg = getMsg(keys[i]);
- }
- answer = promptConfirm(FORMAT_KEY,
- msg, getMsg("cli-uninstall-yes-long"),
- validValues);
+ Message msg = keys[i];
+ answer = promptConfirm(
+ msg, INFO_CLI_UNINSTALL_YES_LONG.get(),
+ validValues);
answers[i] =
- getMsg("cli-uninstall-yes-long").equalsIgnoreCase(answer) ||
- getMsg("cli-uninstall-yes-short").equalsIgnoreCase(answer);
+ INFO_CLI_UNINSTALL_YES_LONG.get().toString().
+ equalsIgnoreCase(answer.toString()) ||
+ INFO_CLI_UNINSTALL_YES_SHORT.get().toString().
+ equalsIgnoreCase(answer.toString());
}
else
{
@@ -315,11 +304,8 @@
!userData.getRemoveLogs())
{
somethingSelected = false;
- if (!userData.isSilent())
- {
- System.out.println(Constants.LINE_SEPARATOR+
- getMsg("cli-uninstall-nothing-to-be-uninstalled"));
- }
+ System.out.println(Constants.LINE_SEPARATOR+
+ INFO_CLI_UNINSTALL_NOTHING_TO_BE_UNINSTALLED.get());
}
else
{
@@ -377,7 +363,6 @@
return cancelled;
}
-
/**
* Ask for confirmation to stop server.
* @return <CODE>true</CODE> if the user wants to continue and stop the
@@ -385,23 +370,7 @@
*/
private boolean confirmToStopServer()
{
- boolean confirm = true;
- String[] validValues = {
- getMsg("cli-uninstall-yes-short"),
- getMsg("cli-uninstall-no-short"),
- getMsg("cli-uninstall-yes-long"),
- getMsg("cli-uninstall-no-long")
- };
- String answer = promptConfirm(FORMAT_KEY,
- getMsg("cli-uninstall-confirm-stop"),
- getMsg("cli-uninstall-yes-long"), validValues);
-
- if (getMsg("cli-uninstall-no-short").equalsIgnoreCase(answer) ||
- getMsg("cli-uninstall-no-long").equalsIgnoreCase(answer))
- {
- confirm = false;
- }
- return confirm;
+ return confirm(INFO_CLI_UNINSTALL_CONFIRM_STOP.get());
}
/**
@@ -411,19 +380,23 @@
*/
private boolean confirmDeleteFiles()
{
- boolean confirm = true;
- String[] validValues = {
- getMsg("cli-uninstall-yes-short"),
- getMsg("cli-uninstall-no-short"),
- getMsg("cli-uninstall-yes-long"),
- getMsg("cli-uninstall-no-long")
- };
- String answer = promptConfirm(FORMAT_KEY,
- getMsg("cli-uninstall-confirm-delete-files"),
- getMsg("cli-uninstall-yes-long"), validValues);
+ return confirm(INFO_CLI_UNINSTALL_CONFIRM_DELETE_FILES.get());
+ }
- if (getMsg("cli-uninstall-no-short").equalsIgnoreCase(answer) ||
- getMsg("cli-uninstall-no-long").equalsIgnoreCase(answer))
+ private boolean confirm(Message msg) {
+ boolean confirm = true;
+ Message[] validValues = {
+ INFO_CLI_UNINSTALL_YES_SHORT.get(),
+ INFO_CLI_UNINSTALL_NO_SHORT.get(),
+ INFO_CLI_UNINSTALL_YES_LONG.get(),
+ INFO_CLI_UNINSTALL_NO_LONG.get(),
+ };
+ Message answer = promptConfirm(msg, validValues[2], validValues);
+
+ if (INFO_CLI_UNINSTALL_NO_SHORT.get().toString()
+ .equalsIgnoreCase(answer.toString()) ||
+ INFO_CLI_UNINSTALL_NO_LONG.get().toString()
+ .equalsIgnoreCase(answer.toString()))
{
confirm = false;
}
--
Gitblit v1.10.0