From d4999249551d8dc494433ade3bb4b3989aec0556 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 07 Apr 2009 09:45:56 +0000
Subject: [PATCH] Fix for issue 3194 (hardcoded letters for menu options in ManageTasks.java)
---
opendj-sdk/opends/src/server/org/opends/server/tools/ManageTasks.java | 12 ++++++------
opendj-sdk/opends/src/messages/messages/tools.properties | 11 ++++++++---
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/tools.properties b/opendj-sdk/opends/src/messages/messages/tools.properties
index 95b0f2a..c73443a 100644
--- a/opendj-sdk/opends/src/messages/messages/tools.properties
+++ b/opendj-sdk/opends/src/messages/messages/tools.properties
@@ -2473,6 +2473,11 @@
SEVERE_ERR_LDAPCOMPARE_FILENAME_AND_DNS_1670=Both entry DNs and a file name \
were provided for the compare operation. These arguments are not compatible
-
-
-
\ No newline at end of file
+
+# The following chars correspond to the following properties:
+# INFO_TASKINFO_CMD_REFRESH_1415=refresh
+# INFO_TASKINFO_CMD_CANCEL_1416=cancel task
+# INFO_TASKINFO_CMD_VIEW_LOGS_1417=view logs
+INFO_TASKINFO_CMD_REFRESH_CHAR_1671=r
+INFO_TASKINFO_CMD_CANCEL_CHAR_1672=c
+INFO_TASKINFO_CMD_VIEW_LOGS_CHAR_1673=l
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ManageTasks.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ManageTasks.java
index 9a3a806..cd5ccbe 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ManageTasks.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ManageTasks.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2009 Sun Microsystems, Inc.
*/
package org.opends.server.tools;
@@ -434,13 +434,13 @@
}
menuBuilder.addCharOption(
- Message.raw("r"),
+ INFO_TASKINFO_CMD_REFRESH_CHAR.get(),
INFO_TASKINFO_CMD_REFRESH.get(),
new PrintSummaryTop());
if (cancelableIndices.size() > 0) {
menuBuilder.addCharOption(
- Message.raw("c"),
+ INFO_TASKINFO_CMD_CANCEL_CHAR.get(),
INFO_TASKINFO_CMD_CANCEL.get(),
new CancelTaskTop(taskIds, cancelableIndices));
}
@@ -565,19 +565,19 @@
new MenuBuilder<TaskEntry>(app);
menuBuilder.addBackOption(true);
menuBuilder.addCharOption(
- Message.raw("r"),
+ INFO_TASKINFO_CMD_REFRESH_CHAR.get(),
INFO_TASKINFO_CMD_REFRESH.get(),
new PrintTaskInfo(taskId));
List<Message> logs = taskEntry.getLogMessages();
if (logs != null && logs.size() > 0) {
menuBuilder.addCharOption(
- Message.raw("l"),
+ INFO_TASKINFO_CMD_VIEW_LOGS_CHAR.get(),
INFO_TASKINFO_CMD_VIEW_LOGS.get(),
new ViewTaskLogs(taskId));
}
if (taskEntry.isCancelable() && !taskEntry.isDone()) {
menuBuilder.addCharOption(
- Message.raw("c"),
+ INFO_TASKINFO_CMD_CANCEL_CHAR.get(),
INFO_TASKINFO_CMD_CANCEL.get(),
new CancelTask(taskId));
}
--
Gitblit v1.10.0