Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 a441ff54 编写于 作者: N nloodin
浏览文件
操作

8014048: Online user guide of jconsole points incorrect link 

Reviewed-by: mchung, sla, jbachorik
上级 e722c318
隐藏空白更改
内联 并排
Showing with 13 addition and 7 deletion
src/share/classes/sun/tools/jconsole/AboutDialog.java
浏览文件 @ a441ff54
...@@ -34,6 +34,7 @@ import javax.swing.*; ...@@ -34,6 +34,7 @@ import javax.swing.*;
import javax.swing.border.*; import javax.swing.border.*;
import javax.swing.event.*; import javax.swing.event.*;
import static sun.misc.Version.jdkMinorVersion;
import static java.awt.BorderLayout.*; import static java.awt.BorderLayout.*;
import static sun.tools.jconsole.Utilities.*; import static sun.tools.jconsole.Utilities.*;
...@@ -73,7 +74,7 @@ public class AboutDialog extends InternalDialog { ...@@ -73,7 +74,7 @@ public class AboutDialog extends InternalDialog {
String jConsoleVersion = Version.getVersion(); String jConsoleVersion = Version.getVersion();
String vmName = System.getProperty("java.vm.name"); String vmName = System.getProperty("java.vm.name");
String vmVersion = System.getProperty("java.vm.version"); String vmVersion = System.getProperty("java.vm.version");
String urlStr = Messages.HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL; String urlStr = getOnlineDocUrl();
if (isBrowseSupported()) { if (isBrowseSupported()) {
urlStr = "<a style='color:#35556b' href=\"" + urlStr + "\">" + urlStr + "</a>"; urlStr = "<a style='color:#35556b' href=\"" + urlStr + "\">" + urlStr + "</a>";
} }
...@@ -86,8 +87,7 @@ public class AboutDialog extends InternalDialog { ...@@ -86,8 +87,7 @@ public class AboutDialog extends InternalDialog {
"<html><font color=#"+ colorStr + ">" + "<html><font color=#"+ colorStr + ">" +
Resources.format(Messages.HELP_ABOUT_DIALOG_JCONSOLE_VERSION, jConsoleVersion) + Resources.format(Messages.HELP_ABOUT_DIALOG_JCONSOLE_VERSION, jConsoleVersion) +
"<p>" + Resources.format(Messages.HELP_ABOUT_DIALOG_JAVA_VERSION, (vmName +", "+ vmVersion)) + "<p>" + Resources.format(Messages.HELP_ABOUT_DIALOG_JAVA_VERSION, (vmName +", "+ vmVersion)) +
"<p>" + Resources.format(Messages.HELP_ABOUT_DIALOG_USER_GUIDE_LINK, urlStr) + "<p>" + urlStr + "</html>");
"</html>");
helpLink.setOpaque(false); helpLink.setOpaque(false);
helpLink.setEditable(false); helpLink.setEditable(false);
helpLink.setForeground(textColor); helpLink.setForeground(textColor);
...@@ -153,7 +153,7 @@ public class AboutDialog extends InternalDialog { ...@@ -153,7 +153,7 @@ public class AboutDialog extends InternalDialog {
} }
static void browseUserGuide(JConsole jConsole) { static void browseUserGuide(JConsole jConsole) {
getAboutDialog(jConsole).browse(Messages.HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL); getAboutDialog(jConsole).browse(getOnlineDocUrl());
} }
static boolean isBrowseSupported() { static boolean isBrowseSupported() {
...@@ -182,6 +182,12 @@ public class AboutDialog extends InternalDialog { ...@@ -182,6 +182,12 @@ public class AboutDialog extends InternalDialog {
}; };
} }
private static String getOnlineDocUrl() {
String version = Integer.toString(jdkMinorVersion());
return Resources.format(Messages.HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL,
version);
}
private static class TPanel extends JPanel { private static class TPanel extends JPanel {
TPanel(int hgap, int vgap) { TPanel(int hgap, int vgap) {
super(new BorderLayout(hgap, vgap)); super(new BorderLayout(hgap, vgap));
......
src/share/classes/sun/tools/jconsole/resources/messages.properties
浏览文件 @ a441ff54
...@@ -105,7 +105,7 @@ HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=Masthead Graphic ...@@ -105,7 +105,7 @@ HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=Masthead Graphic
HELP_ABOUT_DIALOG_MASTHEAD_TITLE=About JConsole HELP_ABOUT_DIALOG_MASTHEAD_TITLE=About JConsole
HELP_ABOUT_DIALOG_TITLE=JConsole: About HELP_ABOUT_DIALOG_TITLE=JConsole: About
HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole &User Guide:<br>{0} HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole &User Guide:<br>{0}
HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://docs.oracle.com/javase/{0}/docs/technotes/guides/management/jconsole.html
HELP_MENU_ABOUT_TITLE=&About JConsole HELP_MENU_ABOUT_TITLE=&About JConsole
HELP_MENU_USER_GUIDE_TITLE=Online &User Guide HELP_MENU_USER_GUIDE_TITLE=Online &User Guide
HELP_MENU_TITLE=&Help HELP_MENU_TITLE=&Help
......
src/share/classes/sun/tools/jconsole/resources/messages_ja.properties
浏览文件 @ a441ff54
...@@ -105,7 +105,7 @@ HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u30DE\u30B9\u30C8\u30D8\u30C3\u30C9\ ...@@ -105,7 +105,7 @@ HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u30DE\u30B9\u30C8\u30D8\u30C3\u30C9\
HELP_ABOUT_DIALOG_MASTHEAD_TITLE=JConsole\u306B\u3064\u3044\u3066 HELP_ABOUT_DIALOG_MASTHEAD_TITLE=JConsole\u306B\u3064\u3044\u3066
HELP_ABOUT_DIALOG_TITLE=JConsole: \u8A73\u7D30 HELP_ABOUT_DIALOG_TITLE=JConsole: \u8A73\u7D30
HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(&U):<br>{0} HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(&U):<br>{0}
HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://docs.oracle.com/javase/{0}/docs/technotes/guides/management/jconsole.html
HELP_MENU_ABOUT_TITLE=JConsole\u306B\u3064\u3044\u3066(&A) HELP_MENU_ABOUT_TITLE=JConsole\u306B\u3064\u3044\u3066(&A)
HELP_MENU_USER_GUIDE_TITLE=\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(&U) HELP_MENU_USER_GUIDE_TITLE=\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(&U)
HELP_MENU_TITLE=\u30D8\u30EB\u30D7(&H) HELP_MENU_TITLE=\u30D8\u30EB\u30D7(&H)
......
src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties
浏览文件 @ a441ff54
...@@ -105,7 +105,7 @@ HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u62A5\u5934\u56FE ...@@ -105,7 +105,7 @@ HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u62A5\u5934\u56FE
HELP_ABOUT_DIALOG_MASTHEAD_TITLE=\u5173\u4E8E JConsole HELP_ABOUT_DIALOG_MASTHEAD_TITLE=\u5173\u4E8E JConsole
HELP_ABOUT_DIALOG_TITLE=JConsole: \u5173\u4E8E HELP_ABOUT_DIALOG_TITLE=JConsole: \u5173\u4E8E
HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole \u7528\u6237\u6307\u5357(&U):<br>{0} HELP_ABOUT_DIALOG_USER_GUIDE_LINK=JConsole \u7528\u6237\u6307\u5357(&U):<br>{0}
HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.html HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://docs.oracle.com/javase/{0}/docs/technotes/guides/management/jconsole.html
HELP_MENU_ABOUT_TITLE=\u5173\u4E8E JConsole(&A) HELP_MENU_ABOUT_TITLE=\u5173\u4E8E JConsole(&A)
HELP_MENU_USER_GUIDE_TITLE=\u8054\u673A\u7528\u6237\u6307\u5357(&U) HELP_MENU_USER_GUIDE_TITLE=\u8054\u673A\u7528\u6237\u6307\u5357(&U)
HELP_MENU_TITLE=\u5E2E\u52A9(&H) HELP_MENU_TITLE=\u5E2E\u52A9(&H)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或