mirror of
https://github.com/openjdk/jdk.git
synced 2026-02-15 21:05:11 +00:00
8030698: Several GUI labels in jconsole need correction
Reviewed-by: sla
This commit is contained in:
Ivan Gerasimov
parent
74e666c00e
commit
2d0da895cd
@ -36,7 +36,7 @@ final public class Messages {
|
||||
Resources.initializeMessages(Messages.class, BUNDLE_NAME);
|
||||
}
|
||||
// TODO:
|
||||
// The names of some of the constants below looks strange.
|
||||
// The names of some of the constants below look strange.
|
||||
// That's because they were generated programmatically
|
||||
// from the messages. They should be cleaned up,
|
||||
// ___ should be removed etc.
|
||||
@ -269,6 +269,7 @@ final public class Messages {
|
||||
public static String SUMMARY_TAB_TAB_NAME;
|
||||
public static String SUMMARY_TAB_VM_VERSION;
|
||||
public static String THREADS;
|
||||
public static String THREAD_TAB_INFO_LABEL_FORMAT;
|
||||
public static String THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME;
|
||||
public static String THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME;
|
||||
public static String THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE;
|
||||
|
||||
@ -213,8 +213,8 @@ class SummaryTab extends Tab {
|
||||
String[] strings2 = formatKByteStrings(u.getCommitted());
|
||||
append(Messages.COMMITTED_MEMORY, strings2[0]);
|
||||
append(Messages.SUMMARY_TAB_PENDING_FINALIZATION_LABEL,
|
||||
Messages.SUMMARY_TAB_PENDING_FINALIZATION_VALUE,
|
||||
memoryBean.getObjectPendingFinalizationCount());
|
||||
Resources.format(Messages.SUMMARY_TAB_PENDING_FINALIZATION_VALUE,
|
||||
memoryBean.getObjectPendingFinalizationCount()));
|
||||
append(endTable);
|
||||
|
||||
append(newTable);
|
||||
|
||||
@ -66,9 +66,6 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
|
||||
|
||||
private static final Border thinEmptyBorder = new EmptyBorder(2, 2, 2, 2);
|
||||
|
||||
private static final String infoLabelFormat = "ThreadTab.infoLabelFormat";
|
||||
|
||||
|
||||
/*
|
||||
Hierarchy of panels and layouts for this tab:
|
||||
|
||||
@ -692,7 +689,7 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
|
||||
|
||||
private void updateThreadsInfo(long tlCount, long tpCount, long ttCount, long timeStamp) {
|
||||
getPlotter().addValues(timeStamp, tlCount);
|
||||
getInfoLabel().setText(Resources.format(infoLabelFormat, tlCount, tpCount, ttCount));
|
||||
getInfoLabel().setText(Resources.format(Messages.THREAD_TAB_INFO_LABEL_FORMAT, tlCount, tpCount, ttCount));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -227,6 +227,7 @@ SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0} objects
|
||||
SUMMARY_TAB_TAB_NAME=VM Summary
|
||||
SUMMARY_TAB_VM_VERSION={0} version {1}
|
||||
THREADS=Threads
|
||||
THREAD_TAB_INFO_LABEL_FORMAT=<html>Live: {0} Peak: {1} Total: {2}</html>
|
||||
THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=Thread Information
|
||||
THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=Chart for number of threads.
|
||||
THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE=[No thread selected]
|
||||
@ -249,7 +250,7 @@ UNKNOWN_HOST=Unknown Host: {0}
|
||||
UNREGISTER=Unregister
|
||||
UPTIME=Uptime
|
||||
USAGE_THRESHOLD=Usage Threshold
|
||||
REMOTE_TF_USAGE=<b>Usage</b>: <hostname>:<port> OR service:jmx:<protocol>:<sap>
|
||||
REMOTE_TF_USAGE=<b>Usage</b>: &<hostname&>:&<port&> OR service:jmx:&<protocol&>:&<sap&>
|
||||
USED=Used
|
||||
USERNAME_COLON_=&Username:
|
||||
USERNAME_ACCESSIBLE_NAME=User Name
|
||||
|
||||
@ -227,6 +227,7 @@ SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0}\u500B\u306E\u30AA\u30D6\u30B8\u30A7\u
|
||||
SUMMARY_TAB_TAB_NAME=VM\u30B5\u30DE\u30EA\u30FC
|
||||
SUMMARY_TAB_VM_VERSION={0}\u30D0\u30FC\u30B8\u30E7\u30F3{1}
|
||||
THREADS=\u30B9\u30EC\u30C3\u30C9
|
||||
THREAD_TAB_INFO_LABEL_FORMAT=<html>\u5B9F\u884C\u4E2D: {0} \u30D4\u30FC\u30AF: {1} \u5408\u8A08: {2}</html>
|
||||
THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u30B9\u30EC\u30C3\u30C9\u60C5\u5831
|
||||
THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u30B9\u30EC\u30C3\u30C9\u6570\u306E\u30C1\u30E3\u30FC\u30C8\u3002
|
||||
THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE=[\u30B9\u30EC\u30C3\u30C9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093]
|
||||
@ -249,7 +250,7 @@ UNKNOWN_HOST=\u4E0D\u660E\u306A\u30DB\u30B9\u30C8: {0}
|
||||
UNREGISTER=\u767B\u9332\u89E3\u9664
|
||||
UPTIME=\u7A3C\u50CD\u6642\u9593
|
||||
USAGE_THRESHOLD=\u4F7F\u7528\u3057\u304D\u3044\u5024
|
||||
REMOTE_TF_USAGE=<b>\u4F7F\u7528\u65B9\u6CD5</b>: <hostname>:<port>\u307E\u305F\u306Fservice:jmx:<protocol>:<sap>
|
||||
REMOTE_TF_USAGE=<b>\u4F7F\u7528\u65B9\u6CD5</b>: &<hostname&>:&<port&>\u307E\u305F\u306Fservice:jmx:&<protocol&>:&<sap&>
|
||||
USED=\u4F7F\u7528\u6E08
|
||||
USERNAME_COLON_=\u30E6\u30FC\u30B6\u30FC\u540D(&U):
|
||||
USERNAME_ACCESSIBLE_NAME=\u30E6\u30FC\u30B6\u30FC\u540D
|
||||
|
||||
@ -227,6 +227,7 @@ SUMMARY_TAB_PENDING_FINALIZATION_VALUE={0}\u5BF9\u8C61
|
||||
SUMMARY_TAB_TAB_NAME=VM \u6982\u8981
|
||||
SUMMARY_TAB_VM_VERSION={0}\u7248\u672C {1}
|
||||
THREADS=\u7EBF\u7A0B
|
||||
THREAD_TAB_INFO_LABEL_FORMAT=<html>\u6D3B\u52A8: {0} \u5CF0\u503C: {1} \u603B\u8BA1: {2}</html>
|
||||
THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME=\u7EBF\u7A0B\u4FE1\u606F
|
||||
THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME=\u8868\u793A\u7EBF\u7A0B\u6570\u7684\u56FE\u8868\u3002
|
||||
THREAD_TAB_INITIAL_STACK_TRACE_MESSAGE=[\u672A\u9009\u62E9\u7EBF\u7A0B]
|
||||
@ -249,7 +250,7 @@ UNKNOWN_HOST=\u672A\u77E5\u4E3B\u673A: {0}
|
||||
UNREGISTER=\u6CE8\u9500
|
||||
UPTIME=\u8FD0\u884C\u65F6\u95F4
|
||||
USAGE_THRESHOLD=\u7528\u6CD5\u9608\u503C
|
||||
REMOTE_TF_USAGE=<b>\u7528\u6CD5</b>: <hostname>:<port> \u6216 service:jmx:<protocol>:<sap>
|
||||
REMOTE_TF_USAGE=<b>\u7528\u6CD5</b>: &<hostname&>:&<port&> \u6216 service:jmx:&<protocol&>:&<sap&>
|
||||
USED=\u5DF2\u7528
|
||||
USERNAME_COLON_=\u7528\u6237\u540D(&U):
|
||||
USERNAME_ACCESSIBLE_NAME=\u7528\u6237\u540D
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user