--- old/src/share/classes/sun/tools/jconsole/AboutDialog.java 2012-05-11 14:50:16.654222181 +0200 +++ new/src/share/classes/sun/tools/jconsole/AboutDialog.java 2012-05-11 14:50:15.788189594 +0200 @@ -30,13 +30,13 @@ import java.beans.PropertyVetoException; import java.net.URI; -import javax.accessibility.*; import javax.swing.*; import javax.swing.border.*; import javax.swing.event.*; +import sun.tools.jconsole.resources.Messages; + import static java.awt.BorderLayout.*; -import static sun.tools.jconsole.Resources.*; import static sun.tools.jconsole.Utilities.*; @SuppressWarnings("serial") @@ -47,7 +47,7 @@ private static final Color borderColor = Color.black; private Icon mastheadIcon = - new MastheadIcon(getText("Help.AboutDialog.masthead.title")); + new MastheadIcon(Messages.HELP_ABOUT_DIALOG_MASTHEAD_TITLE); private static AboutDialog aboutDialog; @@ -55,10 +55,9 @@ private Action closeAction; public AboutDialog(JConsole jConsole) { - super(jConsole, Resources.getText("Help.AboutDialog.title"), false); + super(jConsole, Messages.HELP_ABOUT_DIALOG_TITLE, false); - setAccessibleDescription(this, - getText("Help.AboutDialog.accessibleDescription")); + setAccessibleDescription(this, Messages.HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION); setDefaultCloseOperation(HIDE_ON_CLOSE); setResizable(false); JComponent cp = (JComponent)getContentPane(); @@ -67,7 +66,7 @@ JLabel mastheadLabel = new JLabel(mastheadIcon); setAccessibleName(mastheadLabel, - getText("Help.AboutDialog.masthead.accessibleName")); + Messages.HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME); JPanel mainPanel = new TPanel(0, 0); mainPanel.add(mastheadLabel, NORTH); @@ -75,7 +74,7 @@ String jConsoleVersion = Version.getVersion(); String vmName = System.getProperty("java.vm.name"); String vmVersion = System.getProperty("java.vm.version"); - String urlStr = getText("Help.AboutDialog.userGuideLink.url"); + String urlStr = Messages.HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL; if (isBrowseSupported()) { urlStr = "" + urlStr + ""; } @@ -86,9 +85,9 @@ String colorStr = String.format("%06x", textColor.getRGB() & 0xFFFFFF); JEditorPane helpLink = new JEditorPane("text/html", "" + - getText("Help.AboutDialog.jConsoleVersion", jConsoleVersion) + - "

" + getText("Help.AboutDialog.javaVersion", (vmName +", "+ vmVersion)) + - "

" + getText("Help.AboutDialog.userGuideLink", urlStr) + + Resources.format(Messages.HELP_ABOUT_DIALOG_JCONSOLE_VERSION, jConsoleVersion) + + "

" + Resources.format(Messages.HELP_ABOUT_DIALOG_JAVA_VERSION, (vmName +", "+ vmVersion)) + + "

" + Resources.format(Messages.HELP_ABOUT_DIALOG_USER_GUIDE_LINK, urlStr) + ""); helpLink.setOpaque(false); helpLink.setEditable(false); @@ -155,7 +154,7 @@ } static void browseUserGuide(JConsole jConsole) { - getAboutDialog(jConsole).browse(getText("Help.AboutDialog.userGuideLink.url")); + getAboutDialog(jConsole).browse(Messages.HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL); } static boolean isBrowseSupported() { @@ -176,7 +175,7 @@ } private void createActions() { - closeAction = new AbstractAction(getText("Close")) { + closeAction = new AbstractAction(Messages.CLOSE) { public void actionPerformed(ActionEvent ev) { setVisible(false); statusBar.setText("");