" +
- 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 +153,7 @@ public class AboutDialog extends InternalDialog {
}
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 +174,7 @@ public class AboutDialog extends InternalDialog {
}
private void createActions() {
- closeAction = new AbstractAction(getText("Close")) {
+ closeAction = new AbstractAction(Messages.CLOSE) {
public void actionPerformed(ActionEvent ev) {
setVisible(false);
statusBar.setText("");
diff --git a/src/share/classes/sun/tools/jconsole/BorderedComponent.java b/src/share/classes/sun/tools/jconsole/BorderedComponent.java
index 5b45d74f89547022f09ed1bbb880acefcdfa65ca..57549ec619d8401484548aee9ab3dd3155f4592f 100644
--- a/src/share/classes/sun/tools/jconsole/BorderedComponent.java
+++ b/src/share/classes/sun/tools/jconsole/BorderedComponent.java
@@ -33,11 +33,10 @@ import javax.swing.border.*;
import javax.swing.plaf.*;
import javax.swing.plaf.basic.BasicGraphicsUtils;
+
import static javax.swing.SwingConstants.*;
import static sun.tools.jconsole.JConsole.*;
-import static sun.tools.jconsole.Resources.*;
-import static sun.tools.jconsole.Utilities.*;
@SuppressWarnings("serial")
public class BorderedComponent extends JPanel implements ActionListener {
@@ -47,8 +46,6 @@ public class BorderedComponent extends JPanel implements ActionListener {
JComponent comp;
boolean collapsed = false;
- private JPopupMenu popupMenu;
-
private Icon collapseIcon;
private Icon expandIcon;
@@ -100,7 +97,7 @@ public class BorderedComponent extends JPanel implements ActionListener {
moreOrLessButton.setMargin(new Insets(0, 0, 0, 0));
moreOrLessButton.addActionListener(this);
String toolTip =
- getText("BorderedComponent.moreOrLessButton.toolTip");
+ Messages.BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP;
moreOrLessButton.setToolTipText(toolTip);
borderLabel.add(moreOrLessButton);
borderLabel.setSize(borderLabel.getPreferredSize());
@@ -136,7 +133,8 @@ public class BorderedComponent extends JPanel implements ActionListener {
public void setValueLabel(String str) {
this.valueLabelStr = str;
if (label != null) {
- label.setText(Resources.getText("Current value",valueLabelStr));
+ label.setText(Resources.format(Messages.CURRENT_VALUE,
+ valueLabelStr));
}
}
@@ -151,8 +149,8 @@ public class BorderedComponent extends JPanel implements ActionListener {
remove(comp);
if (valueLabelStr != null) {
if (label == null) {
- label = new JLabel(Resources.getText("Current value",
- valueLabelStr));
+ label = new JLabel(Resources.format(Messages.CURRENT_VALUE,
+ valueLabelStr));
}
add(label);
}
@@ -439,8 +437,6 @@ public class BorderedComponent extends JPanel implements ActionListener {
* @param insets the object to be reinitialized
*/
public Insets getBorderInsets(Component c, Insets insets) {
- int height = 16;
-
Border border = getBorder();
if (border != null) {
if (border instanceof AbstractBorder) {
diff --git a/src/share/classes/sun/tools/jconsole/ClassTab.java b/src/share/classes/sun/tools/jconsole/ClassTab.java
index c47ccbc15fd11788a3a0c30631388681e7d4072e..b192b9f5cd08f868c98ce85f6fbddb84639b7a19 100644
--- a/src/share/classes/sun/tools/jconsole/ClassTab.java
+++ b/src/share/classes/sun/tools/jconsole/ClassTab.java
@@ -33,17 +33,11 @@ import java.lang.reflect.*;
import javax.swing.*;
import javax.swing.border.*;
-import javax.swing.event.*;
-import javax.swing.text.*;
-import java.util.*;
-import java.util.List;
-import java.util.concurrent.*;
-import sun.awt.*;
+import java.util.concurrent.*;
import static sun.tools.jconsole.Formatter.*;
-import static sun.tools.jconsole.Resources.*;
import static sun.tools.jconsole.Utilities.*;
@@ -58,13 +52,9 @@ class ClassTab extends Tab implements ActionListener {
private static final String loadedPlotterKey = "loaded";
private static final String totalLoadedPlotterKey = "totalLoaded";
- private static final String loadedPlotterName = Resources.getText("Loaded");
- private static final String totalLoadedPlotterName = Resources.getText("Total Loaded");
private static final Color loadedPlotterColor = Plotter.defaultColor;
private static final Color totalLoadedPlotterColor = Color.red;
- private static final String infoLabelFormat = "ClassTab.infoLabelFormat";
-
/*
Hierarchy of panels and layouts for this tab:
@@ -88,7 +78,7 @@ class ClassTab extends Tab implements ActionListener {
*/
public static String getTabName() {
- return Resources.getText("Classes");
+ return Messages.CLASSES;
}
public ClassTab(VMPanel vmPanel) {
@@ -108,40 +98,40 @@ class ClassTab extends Tab implements ActionListener {
JPanel controlPanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 20, 5));
topPanel.add(controlPanel, BorderLayout.CENTER);
- verboseCheckBox = new JCheckBox(Resources.getText("Verbose Output"));
+ verboseCheckBox = new JCheckBox(Messages.VERBOSE_OUTPUT);
verboseCheckBox.addActionListener(this);
- verboseCheckBox.setToolTipText(getText("Verbose Output.toolTip"));
+ verboseCheckBox.setToolTipText(Messages.VERBOSE_OUTPUT_TOOLTIP);
JPanel topRightPanel = new JPanel();
topRightPanel.setBorder(new EmptyBorder(0, 65-8, 0, 70));
topRightPanel.add(verboseCheckBox);
topPanel.add(topRightPanel, BorderLayout.AFTER_LINE_ENDS);
- loadedClassesMeter = new PlotterPanel(Resources.getText("Number of Loaded Classes"),
+ loadedClassesMeter = new PlotterPanel(Messages.NUMBER_OF_LOADED_CLASSES,
Plotter.Unit.NONE, false);
loadedClassesMeter.plotter.createSequence(loadedPlotterKey,
- loadedPlotterName,
+ Messages.LOADED,
loadedPlotterColor,
true);
loadedClassesMeter.plotter.createSequence(totalLoadedPlotterKey,
- totalLoadedPlotterName,
+ Messages.TOTAL_LOADED,
totalLoadedPlotterColor,
true);
setAccessibleName(loadedClassesMeter.plotter,
- getText("ClassTab.loadedClassesPlotter.accessibleName"));
+ Messages.CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME);
plotterPanel.add(loadedClassesMeter);
timeComboBox = new TimeComboBox(loadedClassesMeter.plotter);
- controlPanel.add(new LabeledComponent(Resources.getText("Time Range:"),
- getMnemonicInt("Time Range:"),
+ controlPanel.add(new LabeledComponent(Messages.TIME_RANGE_COLON,
+ Resources.getMnemonicInt(Messages.TIME_RANGE_COLON),
timeComboBox));
LabeledComponent.layout(plotterPanel);
- bottomPanel.setBorder(new CompoundBorder(new TitledBorder(Resources.getText("Details")),
- new EmptyBorder(10, 10, 10, 10)));
+ bottomPanel.setBorder(new CompoundBorder(new TitledBorder(Messages.DETAILS),
+ new EmptyBorder(10, 10, 10, 10)));
details = new HTMLPane();
- setAccessibleName(details, getText("Details"));
+ setAccessibleName(details, Messages.DETAILS);
JScrollPane scrollPane = new JScrollPane(details);
scrollPane.setPreferredSize(new Dimension(0, 150));
bottomPanel.add(scrollPane, BorderLayout.SOUTH);
@@ -226,10 +216,10 @@ class ClassTab extends Tab implements ActionListener {
long time = System.currentTimeMillis();
String timeStamp = formatDateTime(time);
- text += newRow(Resources.getText("Time"), timeStamp);
- text += newRow(Resources.getText("Current classes loaded"), justify(clCount, 5));
- text += newRow(Resources.getText("Total classes loaded"), justify(ctCount, 5));
- text += newRow(Resources.getText("Total classes unloaded"), justify(cuCount, 5));
+ text += newRow(Messages.TIME, timeStamp);
+ text += newRow(Messages.CURRENT_CLASSES_LOADED, justify(clCount, 5));
+ text += newRow(Messages.TOTAL_CLASSES_LOADED, justify(ctCount, 5));
+ text += newRow(Messages.TOTAL_CLASSES_UNLOADED, justify(cuCount, 5));
return text;
}
@@ -246,12 +236,13 @@ class ClassTab extends Tab implements ActionListener {
private static class ClassOverviewPanel extends OverviewPanel {
ClassOverviewPanel() {
- super(getText("Classes"), loadedPlotterKey, loadedPlotterName, null);
+ super(Messages.CLASSES, loadedPlotterKey, Messages.LOADED, null);
}
private void updateClassInfo(long total, long loaded) {
long unloaded = (total - loaded);
- getInfoLabel().setText(getText(infoLabelFormat, loaded, unloaded, total));
+ getInfoLabel().setText(Resources.format(Messages.CLASS_TAB_INFO_LABEL_FORMAT,
+ loaded, unloaded, total));
}
}
}
diff --git a/src/share/classes/sun/tools/jconsole/ConnectDialog.java b/src/share/classes/sun/tools/jconsole/ConnectDialog.java
index 2bdd50145d2d30e30177cac22ee79d8f70a240b0..ea6366706c760491dea517544c68b673b883bfcd 100644
--- a/src/share/classes/sun/tools/jconsole/ConnectDialog.java
+++ b/src/share/classes/sun/tools/jconsole/ConnectDialog.java
@@ -29,23 +29,17 @@ import java.util.List;
import java.awt.*;
import java.awt.event.*;
import java.util.*;
-import java.net.MalformedURLException;
-import java.io.IOException;
-import javax.accessibility.*;
import javax.swing.*;
-import javax.swing.Timer;
import javax.swing.border.*;
import javax.swing.event.*;
import javax.swing.plaf.basic.BasicRadioButtonUI;
import javax.swing.table.*;
-import javax.management.remote.JMXServiceURL;
-import javax.management.remote.JMXConnector;
+
import static java.awt.BorderLayout.*;
import static javax.swing.ListSelectionModel.*;
-import static sun.tools.jconsole.Resources.*;
import static sun.tools.jconsole.Utilities.*;
@SuppressWarnings("serial")
@@ -66,7 +60,7 @@ public class ConnectDialog extends InternalDialog
JPanel radioButtonPanel;
private Icon mastheadIcon =
- new MastheadIcon(getText("ConnectDialog.masthead.title"));
+ new MastheadIcon(Messages.CONNECT_DIALOG_MASTHEAD_TITLE);
private Color hintTextColor, disabledTableCellColor;
// The table of managed VM (local process)
@@ -79,11 +73,11 @@ public class ConnectDialog extends InternalDialog
public ConnectDialog(JConsole jConsole) {
- super(jConsole, Resources.getText("ConnectDialog.title"), true);
+ super(jConsole, Messages.CONNECT_DIALOG_TITLE, true);
this.jConsole = jConsole;
setAccessibleDescription(this,
- getText("ConnectDialog.accessibleDescription"));
+ Messages.CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION);
setDefaultCloseOperation(HIDE_ON_CLOSE);
setResizable(false);
Container cp = (JComponent)getContentPane();
@@ -95,7 +89,7 @@ public class ConnectDialog extends InternalDialog
statusBar = new JLabel(" ", JLabel.CENTER);
setAccessibleName(statusBar,
- getText("ConnectDialog.statusBar.accessibleName"));
+ Messages.CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME);
Font normalLabelFont = statusBar.getFont();
Font boldLabelFont = normalLabelFont.deriveFont(Font.BOLD);
@@ -103,7 +97,7 @@ public class ConnectDialog extends InternalDialog
JLabel mastheadLabel = new JLabel(mastheadIcon);
setAccessibleName(mastheadLabel,
- getText("ConnectDialog.masthead.accessibleName"));
+ Messages.CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME);
cp.add(mastheadLabel, NORTH);
cp.add(radioButtonPanel, CENTER);
@@ -117,7 +111,7 @@ public class ConnectDialog extends InternalDialog
remoteTF.addFocusListener(this);
remoteTF.setPreferredSize(remoteTF.getPreferredSize());
setAccessibleName(remoteTF,
- getText("Remote Process.textField.accessibleName"));
+ Messages.REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME);
//
// If the VM supports the local attach mechanism (is: Sun
@@ -141,8 +135,8 @@ public class ConnectDialog extends InternalDialog
TableColumn cmdLineColumn = columnModel.getColumn(COL_NAME);
cmdLineColumn.setResizable(false);
- localRadioButton = new JRadioButton(getText("Local Process:"));
- localRadioButton.setMnemonic(getMnemonicInt("Local Process:"));
+ localRadioButton = new JRadioButton(Messages.LOCAL_PROCESS_COLON);
+ localRadioButton.setMnemonic(Resources.getMnemonicInt(Messages.LOCAL_PROCESS_COLON));
localRadioButton.setFont(boldLabelFont);
localRadioButton.addItemListener(this);
radioButtonGroup.add(localRadioButton);
@@ -167,8 +161,8 @@ public class ConnectDialog extends InternalDialog
localTablePanel.add(localMessageLabel, SOUTH);
}
- remoteRadioButton = new JRadioButton(getText("Remote Process:"));
- remoteRadioButton.setMnemonic(getMnemonicInt("Remote Process:"));
+ remoteRadioButton = new JRadioButton(Messages.REMOTE_PROCESS_COLON);
+ remoteRadioButton.setMnemonic(Resources.getMnemonicInt(Messages.REMOTE_PROCESS_COLON));
remoteRadioButton.setFont(boldLabelFont);
radioButtonGroup.add(remoteRadioButton);
@@ -207,7 +201,7 @@ public class ConnectDialog extends InternalDialog
remoteTFPanel.add(remoteTF, NORTH);
- remoteMessageLabel = new JLabel("" + getText("remoteTF.usage"));
+ remoteMessageLabel = new JLabel("" + Messages.REMOTE_TF_USAGE + "");
remoteMessageLabel.setFont(smallLabelFont);
remoteMessageLabel.setForeground(hintTextColor);
remoteTFPanel.add(remoteMessageLabel, CENTER);
@@ -222,11 +216,10 @@ public class ConnectDialog extends InternalDialog
userNameTF.getDocument().addDocumentListener(this);
userNameTF.addFocusListener(this);
setAccessibleName(userNameTF,
- getText("Username.accessibleName"));
- String labelKey = "Username: ";
+ Messages.USERNAME_ACCESSIBLE_NAME);
LabeledComponent lc;
- lc = new LabeledComponent(getText(labelKey),
- getMnemonicInt(labelKey),
+ lc = new LabeledComponent(Messages.USERNAME_COLON_,
+ Resources.getMnemonicInt(Messages.USERNAME_COLON_),
userNameTF);
lc.label.setFont(boldLabelFont);
userPwdPanel.add(lc);
@@ -238,10 +231,10 @@ public class ConnectDialog extends InternalDialog
passwordTF.getDocument().addDocumentListener(this);
passwordTF.addFocusListener(this);
setAccessibleName(passwordTF,
- getText("Password.accessibleName"));
- labelKey = "Password: ";
- lc = new LabeledComponent(getText(labelKey),
- getMnemonicInt(labelKey),
+ Messages.PASSWORD_ACCESSIBLE_NAME);
+
+ lc = new LabeledComponent(Messages.PASSWORD_COLON_,
+ Resources.getMnemonicInt(Messages.PASSWORD_COLON_),
passwordTF);
lc.setBorder(new EmptyBorder(0, 12, 0, 0)); // Left padding
lc.label.setFont(boldLabelFont);
@@ -250,7 +243,7 @@ public class ConnectDialog extends InternalDialog
remoteTFPanel.add(userPwdPanel, SOUTH);
String connectButtonToolTipText =
- getText("ConnectDialog.connectButton.toolTip");
+ Messages.CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP;
connectButton = new JButton(connectAction);
connectButton.setToolTipText(connectButtonToolTipText);
@@ -288,7 +281,7 @@ public class ConnectDialog extends InternalDialog
String colorStr =
String.format("%06x", hintTextColor.getRGB() & 0xFFFFFF);
remoteMessageLabel.setText("" +
- getText("remoteTF.usage"));
+ Messages.REMOTE_TF_USAGE);
}
if (localMessageLabel != null) {
localMessageLabel.setForeground(hintTextColor);
@@ -300,9 +293,9 @@ public class ConnectDialog extends InternalDialog
}
private void createActions() {
- connectAction = new AbstractAction(getText("Connect")) {
+ connectAction = new AbstractAction(Messages.CONNECT) {
/* init */ {
- putValue(Action.MNEMONIC_KEY, getMnemonicInt("Connect"));
+ putValue(Action.MNEMONIC_KEY, Resources.getMnemonicInt(Messages.CONNECT));
}
public void actionPerformed(ActionEvent ev) {
@@ -321,7 +314,6 @@ public class ConnectDialog extends InternalDialog
try {
if (txt.startsWith(JConsole.ROOT_URL)) {
String url = txt;
- String msg = null;
jConsole.addUrl(url, userName, password, false);
remoteTF.setText(JConsole.ROOT_URL);
return;
@@ -361,7 +353,7 @@ public class ConnectDialog extends InternalDialog
}
};
- cancelAction = new AbstractAction(getText("Cancel")) {
+ cancelAction = new AbstractAction(Messages.CANCEL) {
public void actionPerformed(ActionEvent ev) {
setVisible(false);
statusBar.setText("");
@@ -588,9 +580,9 @@ public class ConnectDialog extends InternalDialog
LocalVirtualMachine lvm = vmModel.vmAt(row);
if (!lvm.isManageable()) {
if (lvm.isAttachable()) {
- labelText = getText("Management Will Be Enabled");
+ labelText = Messages.MANAGEMENT_WILL_BE_ENABLED;
} else {
- labelText = getText("Management Not Enabled");
+ labelText = Messages.MANAGEMENT_NOT_ENABLED;
}
}
}
@@ -650,8 +642,8 @@ public class ConnectDialog extends InternalDialog
// Represents the list of managed VMs as a tabular data model.
private static class ManagedVmTableModel extends AbstractTableModel {
private static String[] columnNames = {
- Resources.getText("Column.Name"),
- Resources.getText("Column.PID"),
+ Messages.COLUMN_NAME,
+ Messages.COLUMN_PID,
};
private List vmList;
@@ -678,7 +670,7 @@ public class ConnectDialog extends InternalDialog
}
}
- public Class getColumnClass(int column) {
+ public Class> getColumnClass(int column) {
switch (column) {
case COL_NAME: return String.class;
case COL_PID: return Integer.class;
@@ -706,13 +698,6 @@ public class ConnectDialog extends InternalDialog
}
}
-
- // Convenience method
- private static String getText(String key) {
- return Resources.getText(key);
- }
-
-
// A blank component that takes up as much space as the
// button part of a JRadioButton.
private static class Padder extends JPanel {
@@ -721,7 +706,7 @@ public class ConnectDialog extends InternalDialog
Padder(JRadioButton radioButton) {
this.radioButton = radioButton;
- setAccessibleName(this, getText("Blank"));
+ setAccessibleName(this, Messages.BLANK);
}
public Dimension getPreferredSize() {
@@ -758,7 +743,6 @@ public class ConnectDialog extends InternalDialog
if (g == null) {
return null;
}
- String clippedText =
SwingUtilities.layoutCompoundLabel(button,
g.getFontMetrics(),
text,
diff --git a/src/share/classes/sun/tools/jconsole/CreateMBeanDialog.java b/src/share/classes/sun/tools/jconsole/CreateMBeanDialog.java
index 75c784bb64f8acad26a20505b111421452ec2954..7d391b8e225c21f4d67b57d9b107d321f38c192a 100644
--- a/src/share/classes/sun/tools/jconsole/CreateMBeanDialog.java
+++ b/src/share/classes/sun/tools/jconsole/CreateMBeanDialog.java
@@ -32,23 +32,21 @@ import java.util.TreeSet;
import java.util.Comparator;
import javax.swing.*;
-import javax.swing.Timer;
import javax.swing.border.*;
-import javax.swing.event.*;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.InstanceAlreadyExistsException;
import javax.management.InstanceNotFoundException;
-import static sun.tools.jconsole.Resources.*;
+
import static sun.tools.jconsole.Utilities.*;
@SuppressWarnings("serial")
public class CreateMBeanDialog extends InternalDialog
implements ActionListener {
JConsole jConsole;
- JComboBox connections;
+ JComboBox connections;
JButton createMBeanButton, unregisterMBeanButton, cancelButton;
private static final String HOTSPOT_MBEAN =
@@ -60,7 +58,7 @@ public class CreateMBeanDialog extends InternalDialog
this.jConsole = jConsole;
setAccessibleDescription(this,
- getText("Hotspot MBeans.dialog.accessibleDescription"));
+ Messages.HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION);
Container cp = getContentPane();
((JComponent)cp).setBorder(new EmptyBorder(10, 10, 4, 10));
@@ -71,12 +69,10 @@ public class CreateMBeanDialog extends InternalDialog
false,
true));
cp.add(centerPanel, BorderLayout.CENTER);
- connections = new JComboBox();
+ connections = new JComboBox();
updateConnections();
- centerPanel.add(new LabeledComponent(Resources.
- getText("Manage Hotspot MBeans "+
- "in: "),
+ centerPanel.add(new LabeledComponent(Resources.format(Messages.MANAGE_HOTSPOT_MBEANS_IN_COLON_),
connections));
JPanel bottomPanel = new JPanel(new BorderLayout());
@@ -85,11 +81,11 @@ public class CreateMBeanDialog extends InternalDialog
JPanel buttonPanel = new JPanel();
bottomPanel.add(buttonPanel, BorderLayout.NORTH);
buttonPanel.add(createMBeanButton =
- new JButton(Resources.getText("Create")));
+ new JButton(Messages.CREATE));
buttonPanel.add(unregisterMBeanButton =
- new JButton(Resources.getText("Unregister")));
+ new JButton(Messages.UNREGISTER));
buttonPanel.add(cancelButton =
- new JButton(Resources.getText("Cancel")));
+ new JButton(Messages.CANCEL));
statusBar = new JLabel(" ", JLabel.CENTER);
bottomPanel.add(statusBar, BorderLayout.SOUTH);
@@ -133,7 +129,8 @@ public class CreateMBeanDialog extends InternalDialog
}
}
connections.invalidate();
- connections.setModel(new DefaultComboBoxModel(data.toArray()));
+ connections.setModel(new DefaultComboBoxModel
+ (data.toArray(new ProxyClient[data.size()])));
connections.validate();
}
@@ -144,7 +141,6 @@ public class CreateMBeanDialog extends InternalDialog
new Thread("CreateMBeanDialog.actionPerformed") {
public void run() {
try {
- StringBuffer buff = null;
Object c = connections.getSelectedItem();
if(c == null) return;
if(ev.getSource() == createMBeanButton) {
@@ -163,13 +159,9 @@ public class CreateMBeanDialog extends InternalDialog
}
return;
} catch(InstanceAlreadyExistsException e) {
- statusBar.setText(Resources.
- getText("Error: MBeans already "
- + "exist"));
+ statusBar.setText(Messages.ERROR_COLON_MBEANS_ALREADY_EXIST);
} catch(InstanceNotFoundException e) {
- statusBar.setText(Resources.
- getText("Error: MBeans do not "
- + "exist"));
+ statusBar.setText(Messages.ERROR_COLON_MBEANS_DO_NOT_EXIST);
} catch(Exception e) {
statusBar.setText(e.toString());
}
diff --git a/src/share/classes/sun/tools/jconsole/Formatter.java b/src/share/classes/sun/tools/jconsole/Formatter.java
index 46f6c0eea850130eaf02953532df79a4e8a5c810..11923412d380860c6838f08bfe70a2a49fd8d037 100644
--- a/src/share/classes/sun/tools/jconsole/Formatter.java
+++ b/src/share/classes/sun/tools/jconsole/Formatter.java
@@ -28,7 +28,6 @@ package sun.tools.jconsole;
import java.text.*;
import java.util.*;
-import static sun.tools.jconsole.Resources.*;
class Formatter {
final static long SECOND = 1000;
@@ -48,7 +47,7 @@ class Formatter {
String str;
if (t < 1 * MINUTE) {
String seconds = String.format("%.3f", t / (double)SECOND);
- str = Resources.getText("DurationSeconds", seconds);
+ str = Resources.format(Messages.DURATION_SECONDS, seconds);
} else {
long remaining = t;
long days = remaining / DAY;
@@ -58,13 +57,13 @@ class Formatter {
long minutes = remaining / MINUTE;
if (t >= 1 * DAY) {
- str = Resources.getText("DurationDaysHoursMinutes",
- days, hours, minutes);
+ str = Resources.format(Messages.DURATION_DAYS_HOURS_MINUTES,
+ days, hours, minutes);
} else if (t >= 1 * HOUR) {
- str = Resources.getText("DurationHoursMinutes",
- hours, minutes);
+ str = Resources.format(Messages.DURATION_HOURS_MINUTES,
+ hours, minutes);
} else {
- str = Resources.getText("DurationMinutes", minutes);
+ str = Resources.format(Messages.DURATION_MINUTES, minutes);
}
}
return str;
@@ -88,8 +87,7 @@ class Formatter {
return dateDF.format(time) + " " + timeWithSecondsDF.format(time);
}
- static DateFormat getDateTimeFormat(String key) {
- String dtfStr = getText(key);
+ static DateFormat getDateTimeFormat(String dtfStr) {
int dateStyle = -1;
int timeStyle = -1;
@@ -153,18 +151,18 @@ class Formatter {
}
String[] strings = formatLongs(bytes);
for (int i = 0; i < n; i++) {
- strings[i] = getText("kbytes", strings[i]);
+ strings[i] = Resources.format(Messages.KBYTES, strings[i]);
}
return strings;
}
static String formatKBytes(long bytes) {
if (bytes == -1) {
- return getText("kbytes", "-1");
+ return Resources.format(Messages.KBYTES, "-1");
}
long kb = bytes / 1024;
- return getText("kbytes", justify(kb, 10));
+ return Resources.format(Messages.KBYTES, justify(kb, 10));
}
@@ -182,13 +180,13 @@ class Formatter {
int exp = (int)Math.log10((double)vMax);
if (exp < 3) {
- s = Resources.getText("Size Bytes", v);
+ s = Resources.format(Messages.SIZE_BYTES, v);
} else if (exp < 6) {
- s = Resources.getText("Size Kb", trimDouble(v / Math.pow(10.0, 3)));
+ s = Resources.format(Messages.SIZE_KB, trimDouble(v / Math.pow(10.0, 3)));
} else if (exp < 9) {
- s = Resources.getText("Size Mb", trimDouble(v / Math.pow(10.0, 6)));
+ s = Resources.format(Messages.SIZE_MB, trimDouble(v / Math.pow(10.0, 6)));
} else {
- s = Resources.getText("Size Gb", trimDouble(v / Math.pow(10.0, 9)));
+ s = Resources.format(Messages.SIZE_GB, trimDouble(v / Math.pow(10.0, 9)));
}
if (html) {
s = s.replace(" ", " ");
diff --git a/src/share/classes/sun/tools/jconsole/HTMLPane.java b/src/share/classes/sun/tools/jconsole/HTMLPane.java
index f92623aa513868ee37a007cbf0c998837f7a63cc..34c3c9bedff5bc9be357be28e755020f2bf56413 100644
--- a/src/share/classes/sun/tools/jconsole/HTMLPane.java
+++ b/src/share/classes/sun/tools/jconsole/HTMLPane.java
@@ -25,8 +25,6 @@
package sun.tools.jconsole;
-import java.awt.Color;
-
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.text.*;
diff --git a/src/share/classes/sun/tools/jconsole/InternalDialog.java b/src/share/classes/sun/tools/jconsole/InternalDialog.java
index 736cb2fce0bf9b61efb279cb3a5c0053a815285c..703e626a2740ba65cf92af011567cee881e9e5b7 100644
--- a/src/share/classes/sun/tools/jconsole/InternalDialog.java
+++ b/src/share/classes/sun/tools/jconsole/InternalDialog.java
@@ -30,8 +30,8 @@ import java.awt.event.*;
import javax.swing.*;
+
import static javax.swing.JLayeredPane.*;
-import static sun.tools.jconsole.Resources.*;
/**
* Used instead of JDialog in a JDesktopPane/JInternalFrame environment.
@@ -73,7 +73,7 @@ public class InternalDialog extends JInternalFrame {
private ImageIcon rightIcon =
new ImageIcon(InternalDialog.class.getResource("resources/masthead-right.png"));
- private Font font = Font.decode(getText("Masthead.font"));
+ private Font font = Font.decode(Messages.MASTHEAD_FONT);
private int gap = 10;
private String title;
diff --git a/src/share/classes/sun/tools/jconsole/JConsole.java b/src/share/classes/sun/tools/jconsole/JConsole.java
index bc4aa1d50e222089fc09773fe9d170fa2cd355f0..443ae80746956626e595b9b4f27c1d3bf0316ee7 100644
--- a/src/share/classes/sun/tools/jconsole/JConsole.java
+++ b/src/share/classes/sun/tools/jconsole/JConsole.java
@@ -29,7 +29,6 @@ import java.awt.*;
import java.awt.event.*;
import java.beans.*;
import java.io.*;
-import java.lang.reflect.InvocationTargetException;
import java.net.*;
import java.util.*;
import java.util.List;
@@ -38,8 +37,6 @@ import javax.swing.*;
import javax.swing.border.*;
import javax.swing.event.*;
import javax.swing.plaf.*;
-import javax.management.remote.JMXServiceURL;
-import javax.management.remote.JMXConnector;
import javax.security.auth.login.FailedLoginException;
import javax.net.ssl.SSLHandshakeException;
@@ -47,7 +44,6 @@ import com.sun.tools.jconsole.JConsolePlugin;
import sun.net.util.IPAddressUtil;
-import static sun.tools.jconsole.Resources.*;
import static sun.tools.jconsole.Utilities.*;
@SuppressWarnings("serial")
@@ -68,7 +64,7 @@ public class JConsole extends JFrame
try {
UIManager.setLookAndFeel(systemLaF);
} catch (Exception e) {
- System.err.println(Resources.getText("JConsole: ", e.getMessage()));
+ System.err.println(Resources.format(Messages.JCONSOLE_COLON_, e.getMessage()));
}
}
}
@@ -87,7 +83,7 @@ public class JConsole extends JFrame
private final static String title =
- Resources.getText("Java Monitoring & Management Console");
+ Messages.JAVA_MONITORING___MANAGEMENT_CONSOLE;
public final static String ROOT_URL =
"service:jmx:";
@@ -116,7 +112,7 @@ public class JConsole extends JFrame
setRootPane(new FixedJRootPane());
setAccessibleDescription(this,
- getText("JConsole.accessibleDescription"));
+ Messages.JCONSOLE_ACCESSIBLE_DESCRIPTION);
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
menuBar = new JMenuBar();
@@ -124,12 +120,12 @@ public class JConsole extends JFrame
// TODO: Use Actions !
- JMenu connectionMenu = new JMenu(getText("Connection"));
- connectionMenu.setMnemonic(getMnemonicInt("Connection"));
+ JMenu connectionMenu = new JMenu(Messages.CONNECTION);
+ connectionMenu.setMnemonic(Resources.getMnemonicInt(Messages.CONNECTION));
menuBar.add(connectionMenu);
if(hotspot) {
- hotspotMI = new JMenuItem(getText("Hotspot MBeans..."));
- hotspotMI.setMnemonic(getMnemonicInt("Hotspot MBeans..."));
+ hotspotMI = new JMenuItem(Messages.HOTSPOT_MBEANS_ELLIPSIS);
+ hotspotMI.setMnemonic(Resources.getMnemonicInt(Messages.HOTSPOT_MBEANS_ELLIPSIS));
hotspotMI.setAccelerator(KeyStroke.
getKeyStroke(KeyEvent.VK_H,
InputEvent.CTRL_MASK));
@@ -139,8 +135,8 @@ public class JConsole extends JFrame
connectionMenu.addSeparator();
}
- connectMI = new JMenuItem(Resources.getText("New Connection..."));
- connectMI.setMnemonic(getMnemonicInt("New Connection..."));
+ connectMI = new JMenuItem(Messages.NEW_CONNECTION_ELLIPSIS);
+ connectMI.setMnemonic(Resources.getMnemonicInt(Messages.NEW_CONNECTION_ELLIPSIS));
connectMI.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N,
InputEvent.CTRL_MASK));
connectMI.addActionListener(this);
@@ -148,27 +144,27 @@ public class JConsole extends JFrame
connectionMenu.addSeparator();
- exitMI = new JMenuItem(Resources.getText("Exit"));
- exitMI.setMnemonic(getMnemonicInt("Exit"));
+ exitMI = new JMenuItem(Messages.EXIT);
+ exitMI.setMnemonic(Resources.getMnemonicInt(Messages.EXIT));
exitMI.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F4,
InputEvent.ALT_MASK));
exitMI.addActionListener(this);
connectionMenu.add(exitMI);
- JMenu helpMenu = new JMenu(getText("HelpMenu.title"));
- helpMenu.setMnemonic(getMnemonicInt("HelpMenu.title"));
+ JMenu helpMenu = new JMenu(Messages.HELP_MENU_TITLE);
+ helpMenu.setMnemonic(Resources.getMnemonicInt(Messages.HELP_MENU_TITLE));
menuBar.add(helpMenu);
if (AboutDialog.isBrowseSupported()) {
- userGuideMI = new JMenuItem(getText("HelpMenu.UserGuide.title"));
- userGuideMI.setMnemonic(getMnemonicInt("HelpMenu.UserGuide.title"));
+ userGuideMI = new JMenuItem(Messages.HELP_MENU_USER_GUIDE_TITLE);
+ userGuideMI.setMnemonic(Resources.getMnemonicInt(Messages.HELP_MENU_USER_GUIDE_TITLE));
userGuideMI.addActionListener(this);
helpMenu.add(userGuideMI);
helpMenu.addSeparator();
}
- aboutMI = new JMenuItem(getText("HelpMenu.About.title"));
- aboutMI.setMnemonic(getMnemonicInt("HelpMenu.About.title"));
+ aboutMI = new JMenuItem(Messages.HELP_MENU_ABOUT_TITLE);
+ aboutMI.setMnemonic(Resources.getMnemonicInt(Messages.HELP_MENU_ABOUT_TITLE));
aboutMI.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0));
aboutMI.addActionListener(this);
helpMenu.add(aboutMI);
@@ -191,8 +187,8 @@ public class JConsole extends JFrame
((BorderLayout)cp.getLayout()).
getLayoutComponent(BorderLayout.CENTER);
- windowMenu = new WindowMenu(Resources.getText("Window"));
- windowMenu.setMnemonic(getMnemonicInt("Window"));
+ windowMenu = new WindowMenu(Messages.WINDOW);
+ windowMenu.setMnemonic(Resources.getMnemonicInt(Messages.WINDOW));
// Add Window menu before Help menu
menuBar.add(windowMenu, menuBar.getComponentCount() - 1);
@@ -219,25 +215,25 @@ public class JConsole extends JFrame
WindowMenu(String text) {
super(text);
- cascadeMI = new JMenuItem(Resources.getText("Cascade"));
- cascadeMI.setMnemonic(getMnemonicInt("Cascade"));
+ cascadeMI = new JMenuItem(Messages.CASCADE);
+ cascadeMI.setMnemonic(Resources.getMnemonicInt(Messages.CASCADE));
cascadeMI.addActionListener(JConsole.this);
add(cascadeMI);
- tileMI = new JMenuItem(Resources.getText("Tile"));
- tileMI.setMnemonic(getMnemonicInt("Tile"));
+ tileMI = new JMenuItem(Messages.TILE);
+ tileMI.setMnemonic(Resources.getMnemonicInt(Messages.TILE));
tileMI.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_T,
InputEvent.CTRL_MASK));
tileMI.addActionListener(JConsole.this);
add(tileMI);
- minimizeAllMI = new JMenuItem(Resources.getText("Minimize All"));
- minimizeAllMI.setMnemonic(getMnemonicInt("Minimize All"));
+ minimizeAllMI = new JMenuItem(Messages.MINIMIZE_ALL);
+ minimizeAllMI.setMnemonic(Resources.getMnemonicInt(Messages.MINIMIZE_ALL));
minimizeAllMI.addActionListener(JConsole.this);
add(minimizeAllMI);
- restoreAllMI = new JMenuItem(Resources.getText("Restore All"));
- restoreAllMI.setMnemonic(getMnemonicInt("Restore All"));
+ restoreAllMI = new JMenuItem(Messages.RESTORE_ALL);
+ restoreAllMI.setMnemonic(Resources.getMnemonicInt(Messages.RESTORE_ALL));
restoreAllMI.addActionListener(JConsole.this);
add(restoreAllMI);
@@ -721,7 +717,7 @@ public class JConsole extends JFrame
}
private String errorMessage(Exception ex) {
- String msg = Resources.getText("Connection failed");
+ String msg = Messages.CONNECTION_FAILED;
if (ex instanceof IOException || ex instanceof SecurityException) {
Throwable cause = null;
Throwable c = ex.getCause();
@@ -732,7 +728,7 @@ public class JConsole extends JFrame
if (cause instanceof ConnectException) {
return msg + ": " + cause.getMessage();
} else if (cause instanceof UnknownHostException) {
- return Resources.getText("Unknown Host", cause.getMessage());
+ return Resources.format(Messages.UNKNOWN_HOST, cause.getMessage());
} else if (cause instanceof NoRouteToHostException) {
return msg + ": " + cause.getMessage();
} else if (cause instanceof FailedLoginException) {
@@ -741,7 +737,7 @@ public class JConsole extends JFrame
return msg + ": "+ cause.getMessage();
}
} else if (ex instanceof MalformedURLException) {
- return Resources.getText("Invalid URL", ex.getMessage());
+ return Resources.format(Messages.INVALID_URL, ex.getMessage());
}
return msg + ": " + ex.getMessage();
}
@@ -770,7 +766,7 @@ public class JConsole extends JFrame
private static void usage() {
- System.err.println(Resources.getText("zz usage text", "jconsole"));
+ System.err.println(Resources.format(Messages.ZZ_USAGE_TEXT, "jconsole"));
}
private static void mainInit(final List urls,
@@ -1003,13 +999,13 @@ public class JConsole extends JFrame
pluginService = plugins;
} catch (ServiceConfigurationError e) {
// Error occurs during initialization of plugin
- System.out.println(Resources.getText("Fail to load plugin",
+ System.out.println(Resources.format(Messages.FAIL_TO_LOAD_PLUGIN,
e.getMessage()));
} catch (MalformedURLException e) {
if (JConsole.isDebug()) {
e.printStackTrace();
}
- System.out.println(Resources.getText("Invalid plugin path",
+ System.out.println(Resources.format(Messages.INVALID_PLUGIN_PATH,
e.getMessage()));
}
}
diff --git a/src/share/classes/sun/tools/jconsole/LabeledComponent.java b/src/share/classes/sun/tools/jconsole/LabeledComponent.java
index 81953f4c690201f3c232c07e9d5edd92c19dfb64..ce045e8f0d37339ad2b9714621d213d87ea3dc16 100644
--- a/src/share/classes/sun/tools/jconsole/LabeledComponent.java
+++ b/src/share/classes/sun/tools/jconsole/LabeledComponent.java
@@ -26,7 +26,6 @@
package sun.tools.jconsole;
import java.awt.*;
-import java.awt.event.*;
import javax.swing.*;
diff --git a/src/share/classes/sun/tools/jconsole/LocalVirtualMachine.java b/src/share/classes/sun/tools/jconsole/LocalVirtualMachine.java
index c99f99f8b137534b74729da82d30226640259eab..4982c0ec84d7291685675e36479e4a3d121252b9 100644
--- a/src/share/classes/sun/tools/jconsole/LocalVirtualMachine.java
+++ b/src/share/classes/sun/tools/jconsole/LocalVirtualMachine.java
@@ -39,7 +39,6 @@ import com.sun.tools.attach.AttachNotSupportedException;
// Sun private
import sun.management.ConnectorAddressLink;
import sun.jvmstat.monitor.HostIdentifier;
-import sun.jvmstat.monitor.Monitor;
import sun.jvmstat.monitor.MonitoredHost;
import sun.jvmstat.monitor.MonitoredVm;
import sun.jvmstat.monitor.MonitoredVmUtil;
@@ -131,7 +130,7 @@ public class LocalVirtualMachine {
private static void getMonitoredVMs(Map map) {
MonitoredHost host;
- Set vms;
+ Set vms;
try {
host = MonitoredHost.getMonitoredHost(new HostIdentifier((String)null));
vms = host.activeVms();
diff --git a/src/share/classes/sun/tools/jconsole/MBeansTab.java b/src/share/classes/sun/tools/jconsole/MBeansTab.java
index abd5de795d007976914d3c8bf538eebaaf385815..cb5bcc1ee8c951888c559ed64f03646729338f46 100644
--- a/src/share/classes/sun/tools/jconsole/MBeansTab.java
+++ b/src/share/classes/sun/tools/jconsole/MBeansTab.java
@@ -52,7 +52,7 @@ public class MBeansTab extends Tab implements
private XDataViewer viewer;
public static String getTabName() {
- return Resources.getText("MBeans");
+ return Messages.MBEANS;
}
public MBeansTab(final VMPanel vmPanel) {
diff --git a/src/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java b/src/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java
index da2b91f3ca2afcf443bb954d2b9e4f5d5879bd74..ab2c1bff121cf6a55f357efd3be8e335e1cfc87a 100644
--- a/src/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java
+++ b/src/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java
@@ -222,7 +222,7 @@ public class MaximizableInternalFrame extends JInternalFrame {
static {
if (JConsole.IS_WIN) {
try {
- Class Part =
+ Class> Part =
Class.forName("com.sun.java.swing.plaf.windows.TMSchema$Part");
if (Part != null) {
WP_MINBUTTON = Part.getField("WP_MINBUTTON").get(null);
diff --git a/src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java b/src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java
index bc6925fd6e43d2277f5134450d23675aabf7771a..a796db0da0b292a8638ee3f91ff351e26da533ff 100644
--- a/src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java
+++ b/src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java
@@ -26,7 +26,6 @@
package sun.tools.jconsole;
import javax.management.ObjectName;
-import java.lang.management.ManagementFactory;
import java.lang.management.MemoryPoolMXBean;
import java.lang.management.MemoryUsage;
import com.sun.management.GarbageCollectorMXBean;
@@ -34,21 +33,18 @@ import com.sun.management.GcInfo;
import java.util.HashMap;
import java.util.Set;
import java.util.Map;
-import java.util.Map.Entry;
import static java.lang.management.ManagementFactory.*;
public class MemoryPoolProxy {
private String poolName;
private ProxyClient client;
- private ObjectName objName;
private MemoryPoolMXBean pool;
private Map gcMBeans;
private GcInfo lastGcInfo;
public MemoryPoolProxy(ProxyClient client, ObjectName poolName) throws java.io.IOException {
this.client = client;
- this.objName = objName;
this.pool = client.getMXBean(poolName, MemoryPoolMXBean.class);
this.poolName = this.pool.getName();
this.gcMBeans = new HashMap();
@@ -73,10 +69,6 @@ public class MemoryPoolProxy {
return (gcMBeans.size() != 0);
}
- public ObjectName getObjectName() {
- return objName;
- }
-
public MemoryPoolStat getStat() throws java.io.IOException {
long usageThreshold = (pool.isUsageThresholdSupported()
? pool.getUsageThreshold()
diff --git a/src/share/classes/sun/tools/jconsole/MemoryPoolStat.java b/src/share/classes/sun/tools/jconsole/MemoryPoolStat.java
index 86cb99703954f29ad2432b15453067bc318a2796..869c44e6a1c2565b9d2d96902e6a2ae135634948 100644
--- a/src/share/classes/sun/tools/jconsole/MemoryPoolStat.java
+++ b/src/share/classes/sun/tools/jconsole/MemoryPoolStat.java
@@ -129,6 +129,6 @@ public class MemoryPoolStat {
* null if no GC occurs.
*/
public MemoryUsage getAfterGcUsage() {
- return beforeGcUsage;
+ return afterGcUsage;
}
}
diff --git a/src/share/classes/sun/tools/jconsole/MemoryTab.java b/src/share/classes/sun/tools/jconsole/MemoryTab.java
index 03e2f84c019f9cf327cc44d8970c39daff0a32f5..756fa18b079c28b5720582f9c8f729ab7b0fa4a6 100644
--- a/src/share/classes/sun/tools/jconsole/MemoryTab.java
+++ b/src/share/classes/sun/tools/jconsole/MemoryTab.java
@@ -38,18 +38,14 @@ import javax.management.*;
import javax.management.openmbean.CompositeData;
import javax.swing.*;
import javax.swing.border.*;
-import javax.swing.text.*;
-import sun.management.*;
import static sun.tools.jconsole.Formatter.*;
-import static sun.tools.jconsole.OverviewPanel.*;
-import static sun.tools.jconsole.Resources.*;
import static sun.tools.jconsole.Utilities.*;
@SuppressWarnings("serial")
class MemoryTab extends Tab implements ActionListener, ItemListener {
- JComboBox plotterChoice;
+ JComboBox plotterChoice;
TimeComboBox timeComboBox;
JButton gcButton;
@@ -67,19 +63,11 @@ class MemoryTab extends Tab implements ActionListener, ItemListener {
private static final String committedKey = "committed";
private static final String maxKey = "max";
private static final String thresholdKey = "threshold";
-
- private static final String usedName = Resources.getText("Used");
- private static final String committedName = Resources.getText("Committed");
- private static final String maxName = Resources.getText("Max");
- private static final String thresholdName = Resources.getText("Threshold");
-
private static final Color usedColor = Plotter.defaultColor;
private static final Color committedColor = null;
private static final Color maxColor = null;
private static final Color thresholdColor = Color.red;
- private static final String infoLabelFormat = "MemoryTab.infoLabelFormat";
-
/*
Hierarchy of panels and layouts for this tab:
@@ -105,7 +93,7 @@ class MemoryTab extends Tab implements ActionListener, ItemListener {
public static String getTabName() {
- return getText("Memory");
+ return Messages.MEMORY;
}
public MemoryTab(VMPanel vmPanel) {
@@ -125,32 +113,32 @@ class MemoryTab extends Tab implements ActionListener, ItemListener {
topPanel.add(controlPanel, BorderLayout.CENTER);
// Plotter choice
- plotterChoice = new JComboBox();
+ plotterChoice = new JComboBox();
plotterChoice.addItemListener(this);
- controlPanel.add(new LabeledComponent(getText("Chart:"),
- getMnemonicInt("Chart:"),
+ controlPanel.add(new LabeledComponent(Messages.CHART_COLON,
+ Resources.getMnemonicInt(Messages.CHART_COLON),
plotterChoice));
// Range control
timeComboBox = new TimeComboBox();
- controlPanel.add(new LabeledComponent(getText("Time Range:"),
- getMnemonicInt("Time Range:"),
+ controlPanel.add(new LabeledComponent(Messages.TIME_RANGE_COLON,
+ Resources.getMnemonicInt(Messages.TIME_RANGE_COLON),
timeComboBox));
- gcButton = new JButton(getText("Perform GC"));
- gcButton.setMnemonic(getMnemonicInt("Perform GC"));
+ gcButton = new JButton(Messages.PERFORM_GC);
+ gcButton.setMnemonic(Resources.getMnemonicInt(Messages.PERFORM_GC));
gcButton.addActionListener(this);
- gcButton.setToolTipText(getText("Perform GC.toolTip"));
+ gcButton.setToolTipText(Messages.PERFORM_GC_TOOLTIP);
JPanel topRightPanel = new JPanel();
topRightPanel.setBorder(new EmptyBorder(0, 65-8, 0, 70));
topRightPanel.add(gcButton);
topPanel.add(topRightPanel, BorderLayout.AFTER_LINE_ENDS);
- bottomPanel.setBorder(new CompoundBorder(new TitledBorder(getText("Details")),
+ bottomPanel.setBorder(new CompoundBorder(new TitledBorder(Messages.DETAILS),
new EmptyBorder(10, 10, 10, 10)));
details = new HTMLPane();
- setAccessibleName(details, getText("Details"));
+ setAccessibleName(details, Messages.DETAILS);
bottomPanel.add(new JScrollPane(details), BorderLayout.CENTER);
poolChart = new PoolChart();
@@ -165,31 +153,31 @@ class MemoryTab extends Tab implements ActionListener, ItemListener {
heapPlotter = new Plotter(Plotter.Unit.BYTES) {
public String toString() {
- return Resources.getText("Heap Memory Usage");
+ return Messages.HEAP_MEMORY_USAGE;
}
};
proxyClient.addWeakPropertyChangeListener(heapPlotter);
nonHeapPlotter = new Plotter(Plotter.Unit.BYTES) {
public String toString() {
- return Resources.getText("Non-Heap Memory Usage");
+ return Messages.NON_HEAP_MEMORY_USAGE;
}
};
setAccessibleName(heapPlotter,
- getText("MemoryTab.heapPlotter.accessibleName"));
+ Messages.MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME);
setAccessibleName(nonHeapPlotter,
- getText("MemoryTab.nonHeapPlotter.accessibleName"));
+ Messages.MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME);
proxyClient.addWeakPropertyChangeListener(nonHeapPlotter);
- heapPlotter.createSequence(usedKey, usedName, usedColor, true);
- heapPlotter.createSequence(committedKey, committedName, committedColor, false);
- heapPlotter.createSequence(maxKey, maxName, maxColor, false);
+ heapPlotter.createSequence(usedKey, Messages.USED, usedColor, true);
+ heapPlotter.createSequence(committedKey, Messages.COMMITTED, committedColor, false);
+ heapPlotter.createSequence(maxKey, Messages.MAX, maxColor, false);
- nonHeapPlotter.createSequence(usedKey, usedName, usedColor, true);
- nonHeapPlotter.createSequence(committedKey, committedName, committedColor, false);
- nonHeapPlotter.createSequence(maxKey, maxName, maxColor, false);
+ nonHeapPlotter.createSequence(usedKey, Messages.USED, usedColor, true);
+ nonHeapPlotter.createSequence(committedKey, Messages.COMMITTED, committedColor, false);
+ nonHeapPlotter.createSequence(maxKey, Messages.MAX, maxColor, false);
plotterList.add(heapPlotter);
plotterList.add(nonHeapPlotter);
@@ -202,8 +190,8 @@ class MemoryTab extends Tab implements ActionListener, ItemListener {
for (ObjectName objectName : objectNames) {
String type = objectName.getKeyProperty("type");
if (type.equals("MemoryPool")) {
- String name = getText("MemoryPoolLabel",
- objectName.getKeyProperty("name"));
+ String name = Resources.format(Messages.MEMORY_POOL_LABEL,
+ objectName.getKeyProperty("name"));
// Heap or non-heap?
boolean isHeap = false;
AttributeList al =
@@ -215,10 +203,10 @@ class MemoryTab extends Tab implements ActionListener, ItemListener {
PoolPlotter poolPlotter = new PoolPlotter(objectName, name, isHeap);
proxyClient.addWeakPropertyChangeListener(poolPlotter);
- poolPlotter.createSequence(usedKey, usedName, usedColor, true);
- poolPlotter.createSequence(committedKey, committedName, committedColor, false);
- poolPlotter.createSequence(maxKey, maxName, maxColor, false);
- poolPlotter.createSequence(thresholdKey, thresholdName, thresholdColor, false);
+ poolPlotter.createSequence(usedKey, Messages.USED, usedColor, true);
+ poolPlotter.createSequence(committedKey, Messages.COMMITTED, committedColor, false);
+ poolPlotter.createSequence(maxKey, Messages.MAX, maxColor, false);
+ poolPlotter.createSequence(thresholdKey, Messages.THRESHOLD, thresholdColor, false);
poolPlotter.setUseDashedTransitions(thresholdKey, true);
if (isHeap) {
@@ -286,7 +274,6 @@ class MemoryTab extends Tab implements ActionListener, ItemListener {
max = new long[n];
threshold = new long[n];
timeStamp = System.currentTimeMillis();
- int poolCount = 0;
for (int i = 0; i < n; i++) {
Plotter plotter = plotterList.get(i);
@@ -400,22 +387,22 @@ class MemoryTab extends Tab implements ActionListener, ItemListener {
//long time = plotter.getLastTimeStamp();
long time = System.currentTimeMillis();
String timeStamp = formatDateTime(time);
- text += newRow(getText("Time"), timeStamp);
+ text += newRow(Messages.TIME, timeStamp);
long used = plotter.getLastValue(usedKey);
long committed = plotter.getLastValue(committedKey);
long max = plotter.getLastValue(maxKey);
long threshold = plotter.getLastValue(thresholdKey);
- text += newRow(getText("Used"), formatKBytes(used));
+ text += newRow(Messages.USED, formatKBytes(used));
if (committed > 0L) {
- text += newRow(getText("Committed"), formatKBytes(committed));
+ text += newRow(Messages.COMMITTED, formatKBytes(committed));
}
if (max > 0L) {
- text += newRow(getText("Max"), formatKBytes(max));
+ text += newRow(Messages.MAX, formatKBytes(max));
}
if (threshold > 0L) {
- text += newRow(getText("Usage Threshold"), formatKBytes(threshold));
+ text += newRow(Messages.USAGE_THRESHOLD, formatKBytes(threshold));
}
try {
@@ -427,11 +414,11 @@ class MemoryTab extends Tab implements ActionListener, ItemListener {
String gcName = garbageCollectorMBean.getName();
long gcCount = garbageCollectorMBean.getCollectionCount();
long gcTime = garbageCollectorMBean.getCollectionTime();
- String str = getText("GC time details", justify(formatTime(gcTime), 14),
- gcName,
- String.format("%,d",gcCount));
+ String str = Resources.format(Messages.GC_TIME_DETAILS, justify(formatTime(gcTime), 14),
+ gcName,
+ String.format("%,d",gcCount));
if (!descPrinted) {
- text += newRow(getText("GC time"), str);
+ text += newRow(Messages.GC_TIME, str);
descPrinted = true;
} else {
text += newRow(null, str);
@@ -465,8 +452,8 @@ class MemoryTab extends Tab implements ActionListener, ItemListener {
this.isHeap = isHeap;
setAccessibleName(this,
- getText("MemoryTab.poolPlotter.accessibleName",
- name));
+ Resources.format(Messages.MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME,
+ name));
}
@@ -627,7 +614,7 @@ class MemoryTab extends Tab implements ActionListener, ItemListener {
g.setColor(nonHeapColor);
g.fillRect(nonHeapRect.x + 1, nonHeapRect.y + 1, nonHeapRect.width - 1, nonHeapRect.height - 1);
- String str = getText("Heap");
+ String str = Messages.HEAP;
int stringWidth = fm.stringWidth(str);
int x = heapRect.x + (heapRect.width - stringWidth) / 2;
int y = heapRect.y + heapRect.height - 6;
@@ -639,7 +626,7 @@ class MemoryTab extends Tab implements ActionListener, ItemListener {
g.setColor(Color.black);
g.drawString(str, x, y);
- str = getText("Non-Heap");
+ str = Messages.NON_HEAP;
stringWidth = fm.stringWidth(str);
x = nonHeapRect.x + (nonHeapRect.width - stringWidth) / 2;
y = nonHeapRect.y + nonHeapRect.height - 6;
@@ -728,26 +715,26 @@ class MemoryTab extends Tab implements ActionListener, ItemListener {
protected class AccessiblePoolChart extends AccessibleJPanel {
public String getAccessibleName() {
- String name = getText("MemoryTab.poolChart.accessibleName");
+ String name = Messages.MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME;
String keyValueList = "";
for (PoolPlotter poolPlotter : poolPlotters) {
String value = (poolPlotter.value * 100 / poolPlotter.max) + "%";
// Assume format string ends with newline
keyValueList +=
- getText("Plotter.accessibleName.keyAndValue",
- poolPlotter.toString(), value);
+ Resources.format(Messages.PLOTTER_ACCESSIBLE_NAME_KEY_AND_VALUE,
+ poolPlotter.toString(), value);
if (poolPlotter.threshold > 0L) {
String threshold =
(poolPlotter.threshold * 100 / poolPlotter.max) + "%";
if (poolPlotter.value > poolPlotter.threshold) {
keyValueList +=
- getText("MemoryTab.poolChart.aboveThreshold",
- threshold);
+ Resources.format(Messages.MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD,
+ threshold);
} else {
keyValueList +=
- getText("MemoryTab.poolChart.belowThreshold",
- threshold);
+ Resources.format(Messages.MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD,
+ threshold);
}
}
}
@@ -767,14 +754,14 @@ class MemoryTab extends Tab implements ActionListener, ItemListener {
private static class MemoryOverviewPanel extends OverviewPanel {
MemoryOverviewPanel() {
- super(getText("Heap Memory Usage"), usedKey, usedName, Plotter.Unit.BYTES);
+ super(Messages.HEAP_MEMORY_USAGE, usedKey, Messages.USED, Plotter.Unit.BYTES);
}
private void updateMemoryInfo(long used, long committed, long max) {
- getInfoLabel().setText(getText(infoLabelFormat,
- formatBytes(used, true),
- formatBytes(committed, true),
- formatBytes(max, true)));
+ getInfoLabel().setText(Resources.format(Messages.MEMORY_TAB_INFO_LABEL_FORMAT,
+ formatBytes(used, true),
+ formatBytes(committed, true),
+ formatBytes(max, true)));
}
}
}
diff --git a/src/share/classes/sun/tools/jconsole/Messages.java b/src/share/classes/sun/tools/jconsole/Messages.java
new file mode 100644
index 0000000000000000000000000000000000000000..27001f27cccf359949ce1285691a45ae0028435f
--- /dev/null
+++ b/src/share/classes/sun/tools/jconsole/Messages.java
@@ -0,0 +1,316 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package sun.tools.jconsole;
+
+
+/**
+ * Class that contains localized messages.
+ *
+ */
+final public class Messages {
+ private static final String BUNDLE_NAME = "sun.tools.jconsole.resources.messages";
+
+ static {
+ Resources.initializeMessages(Messages.class, BUNDLE_NAME);
+ }
+ // TODO:
+ // The names of some of the constants below looks strange.
+ // That's because they were generated programmatically
+ // from the messages. They should be cleaned up,
+ // ___ should be removed etc.
+ public static String ONE_DAY;
+ public static String ONE_HOUR;
+ public static String ONE_MIN;
+ public static String ONE_MONTH;
+ public static String ONE_YEAR;
+ public static String TWO_HOURS;
+ public static String THREE_HOURS;
+ public static String THREE_MONTHS;
+ public static String FIVE_MIN;
+ public static String SIX_HOURS;
+ public static String SIX_MONTHS;
+ public static String SEVEN_DAYS;
+ public static String TEN_MIN;
+ public static String TWELVE_HOURS;
+ public static String THIRTY_MIN;
+ public static String LESS_THAN;
+ public static String A_LOT_LESS_THAN;
+ public static String GREATER_THAN;
+ public static String ACTION_CAPITALIZED;
+ public static String ACTION_INFO_CAPITALIZED;
+ public static String ALL;
+ public static String ARCHITECTURE;
+ public static String ATTRIBUTE;
+ public static String ATTRIBUTE_VALUE;
+ public static String ATTRIBUTE_VALUES;
+ public static String ATTRIBUTES;
+ public static String BLANK;
+ public static String BLOCKED_COUNT_WAITED_COUNT;
+ public static String BOOT_CLASS_PATH;
+ public static String BORDERED_COMPONENT_MORE_OR_LESS_BUTTON_TOOLTIP;
+ public static String CPU_USAGE;
+ public static String CPU_USAGE_FORMAT;
+ public static String CANCEL;
+ public static String CASCADE;
+ public static String CHART_COLON;
+ public static String CLASS_PATH;
+ public static String CLASS_NAME;
+ public static String CLASS_TAB_INFO_LABEL_FORMAT;
+ public static String CLASS_TAB_LOADED_CLASSES_PLOTTER_ACCESSIBLE_NAME;
+ public static String CLASSES;
+ public static String CLOSE;
+ public static String COLUMN_NAME;
+ public static String COLUMN_PID;
+ public static String COMMITTED_MEMORY;
+ public static String COMMITTED_VIRTUAL_MEMORY;
+ public static String COMMITTED;
+ public static String CONNECT;
+ public static String CONNECT_DIALOG_CONNECT_BUTTON_TOOLTIP;
+ public static String CONNECT_DIALOG_ACCESSIBLE_DESCRIPTION;
+ public static String CONNECT_DIALOG_MASTHEAD_ACCESSIBLE_NAME;
+ public static String CONNECT_DIALOG_MASTHEAD_TITLE;
+ public static String CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME;
+ public static String CONNECT_DIALOG_TITLE;
+ public static String CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_;
+ public static String CONNECTION_FAILED;
+ public static String CONNECTION;
+ public static String CONNECTION_NAME;
+ public static String CONNECTION_NAME__DISCONNECTED_;
+ public static String CONSTRUCTOR;
+ public static String CURRENT_CLASSES_LOADED;
+ public static String CURRENT_HEAP_SIZE;
+ public static String CURRENT_VALUE;
+ public static String CREATE;
+ public static String DAEMON_THREADS;
+ public static String DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_;
+ public static String DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE;
+ public static String DOUBLE_CLICK_TO_VISUALIZE;
+ public static String DESCRIPTION;
+ public static String DESCRIPTOR;
+ public static String DETAILS;
+ public static String DETECT_DEADLOCK;
+ public static String DETECT_DEADLOCK_TOOLTIP;
+ public static String DIMENSION_IS_NOT_SUPPORTED_COLON;
+ public static String DISCARD_CHART;
+ public static String DURATION_DAYS_HOURS_MINUTES;
+ public static String DURATION_HOURS_MINUTES;
+ public static String DURATION_MINUTES;
+ public static String DURATION_SECONDS;
+ public static String EMPTY_ARRAY;
+ public static String ERROR;
+ public static String ERROR_COLON_MBEANS_ALREADY_EXIST;
+ public static String ERROR_COLON_MBEANS_DO_NOT_EXIST;
+ public static String EVENT;
+ public static String EXIT;
+ public static String FAIL_TO_LOAD_PLUGIN;
+ public static String FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION;
+ public static String FILE_CHOOSER_FILE_EXISTS_MESSAGE;
+ public static String FILE_CHOOSER_FILE_EXISTS_OK_OPTION;
+ public static String FILE_CHOOSER_FILE_EXISTS_TITLE;
+ public static String FILE_CHOOSER_SAVED_FILE;
+ public static String FILE_CHOOSER_SAVE_FAILED_MESSAGE;
+ public static String FILE_CHOOSER_SAVE_FAILED_TITLE;
+ public static String FREE_PHYSICAL_MEMORY;
+ public static String FREE_SWAP_SPACE;
+ public static String GARBAGE_COLLECTOR;
+ public static String GC_INFO;
+ public static String GC_TIME;
+ public static String GC_TIME_DETAILS;
+ public static String HEAP_MEMORY_USAGE;
+ public static String HEAP;
+ public static String HELP_ABOUT_DIALOG_ACCESSIBLE_DESCRIPTION;
+ public static String HELP_ABOUT_DIALOG_JCONSOLE_VERSION;
+ public static String HELP_ABOUT_DIALOG_JAVA_VERSION;
+ public static String HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME;
+ public static String HELP_ABOUT_DIALOG_MASTHEAD_TITLE;
+ public static String HELP_ABOUT_DIALOG_TITLE;
+ public static String HELP_ABOUT_DIALOG_USER_GUIDE_LINK;
+ public static String HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL;
+ public static String HELP_MENU_ABOUT_TITLE;
+ public static String HELP_MENU_USER_GUIDE_TITLE;
+ public static String HELP_MENU_TITLE;
+ public static String HOTSPOT_MBEANS_ELLIPSIS;
+ public static String HOTSPOT_MBEANS_DIALOG_ACCESSIBLE_DESCRIPTION;
+ public static String IMPACT;
+ public static String INFO;
+ public static String INFO_CAPITALIZED;
+ public static String INVALID_PLUGIN_PATH;
+ public static String INVALID_URL;
+ public static String IS;
+ public static String JAVA_MONITORING___MANAGEMENT_CONSOLE;
+ public static String JCONSOLE_COLON_;
+ public static String JCONSOLE_VERSION; // in version template
+ public static String JCONSOLE_ACCESSIBLE_DESCRIPTION;
+ public static String JIT_COMPILER;
+ public static String LIBRARY_PATH;
+ public static String LIVE_THREADS;
+ public static String LOADED;
+ public static String LOCAL_PROCESS_COLON;
+ public static String MASTHEAD_FONT;
+ public static String MANAGEMENT_NOT_ENABLED;
+ public static String MANAGEMENT_WILL_BE_ENABLED;
+ public static String MBEAN_ATTRIBUTE_INFO;
+ public static String MBEAN_INFO;
+ public static String MBEAN_NOTIFICATION_INFO;
+ public static String MBEAN_OPERATION_INFO;
+ public static String MBEANS;
+ public static String MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON;
+ public static String MBEANS_TAB_CLEAR_NOTIFICATIONS_BUTTON_TOOLTIP;
+ public static String MBEANS_TAB_COMPOSITE_NAVIGATION_MULTIPLE;
+ public static String MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE;
+ public static String MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON;
+ public static String MBEANS_TAB_REFRESH_ATTRIBUTES_BUTTON_TOOLTIP;
+ public static String MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON;
+ public static String MBEANS_TAB_SUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP;
+ public static String MBEANS_TAB_TABULAR_NAVIGATION_MULTIPLE;
+ public static String MBEANS_TAB_TABULAR_NAVIGATION_SINGLE;
+ public static String MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON;
+ public static String MBEANS_TAB_UNSUBSCRIBE_NOTIFICATIONS_BUTTON_TOOLTIP;
+ public static String MANAGE_HOTSPOT_MBEANS_IN_COLON_;
+ public static String MAX;
+ public static String MAXIMUM_HEAP_SIZE;
+ public static String MEMORY;
+ public static String MEMORY_POOL_LABEL;
+ public static String MEMORY_TAB_HEAP_PLOTTER_ACCESSIBLE_NAME;
+ public static String MEMORY_TAB_INFO_LABEL_FORMAT;
+ public static String MEMORY_TAB_NON_HEAP_PLOTTER_ACCESSIBLE_NAME;
+ public static String MEMORY_TAB_POOL_CHART_ABOVE_THRESHOLD;
+ public static String MEMORY_TAB_POOL_CHART_ACCESSIBLE_NAME;
+ public static String MEMORY_TAB_POOL_CHART_BELOW_THRESHOLD;
+ public static String MEMORY_TAB_POOL_PLOTTER_ACCESSIBLE_NAME;
+ public static String MESSAGE;
+ public static String METHOD_SUCCESSFULLY_INVOKED;
+ public static String MINIMIZE_ALL;
+ public static String MONITOR_LOCKED;
+ public static String NAME;
+ public static String NAME_STATE;
+ public static String NAME_STATE_LOCK_NAME;
+ public static String NAME_STATE_LOCK_NAME_LOCK_OWNER;
+ public static String NAME_AND_BUILD;// in version template
+ public static String NEW_CONNECTION_ELLIPSIS;
+ public static String NO_DEADLOCK_DETECTED;
+ public static String NON_HEAP_MEMORY_USAGE;
+ public static String NON_HEAP;
+ public static String NOTIFICATION;
+ public static String NOTIFICATION_BUFFER;
+ public static String NOTIFICATIONS;
+ public static String NOTIF_TYPES;
+ public static String NUMBER_OF_THREADS;
+ public static String NUMBER_OF_LOADED_CLASSES;
+ public static String NUMBER_OF_PROCESSORS;
+ public static String OBJECT_NAME;
+ public static String OPERATING_SYSTEM;
+ public static String OPERATION;
+ public static String OPERATION_INVOCATION;
+ public static String OPERATION_RETURN_VALUE;
+ public static String OPERATIONS;
+ public static String OVERVIEW;
+ public static String OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME;
+ public static String PARAMETER;
+ public static String PASSWORD_COLON_;
+ public static String PASSWORD_ACCESSIBLE_NAME;
+ public static String PEAK;
+ public static String PERFORM_GC;
+ public static String PERFORM_GC_TOOLTIP;
+ public static String PLOTTER_ACCESSIBLE_NAME;
+ public static String PLOTTER_ACCESSIBLE_NAME_KEY_AND_VALUE;
+ public static String PLOTTER_ACCESSIBLE_NAME_NO_DATA;
+ public static String PLOTTER_SAVE_AS_MENU_ITEM;
+ public static String PLOTTER_TIME_RANGE_MENU;
+ public static String PROBLEM_ADDING_LISTENER;
+ public static String PROBLEM_DISPLAYING_MBEAN;
+ public static String PROBLEM_INVOKING;
+ public static String PROBLEM_REMOVING_LISTENER;
+ public static String PROBLEM_SETTING_ATTRIBUTE;
+ public static String PROCESS_CPU_TIME;
+ public static String READABLE;
+ public static String RECONNECT;
+ public static String REMOTE_PROCESS_COLON;
+ public static String REMOTE_PROCESS_TEXT_FIELD_ACCESSIBLE_NAME;
+ public static String RESTORE_ALL;
+ public static String RETURN_TYPE;
+ public static String SEQ_NUM;
+ public static String SIZE_BYTES;
+ public static String SIZE_GB;
+ public static String SIZE_KB;
+ public static String SIZE_MB;
+ public static String SOURCE;
+ public static String STACK_TRACE;
+ public static String SUMMARY_TAB_HEADER_DATE_TIME_FORMAT;
+ public static String SUMMARY_TAB_PENDING_FINALIZATION_LABEL;
+ public static String SUMMARY_TAB_PENDING_FINALIZATION_VALUE;
+ public static String SUMMARY_TAB_TAB_NAME;
+ public static String SUMMARY_TAB_VM_VERSION;
+ public static String THREADS;
+ public static String THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME;
+ public static String THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME;
+ public static String THRESHOLD;
+ public static String TILE;
+ public static String TIME_RANGE_COLON;
+ public static String TIME;
+ public static String TIME_STAMP;
+ public static String TOTAL_LOADED;
+ public static String TOTAL_CLASSES_LOADED;
+ public static String TOTAL_CLASSES_UNLOADED;
+ public static String TOTAL_COMPILE_TIME;
+ public static String TOTAL_PHYSICAL_MEMORY;
+ public static String TOTAL_THREADS_STARTED;
+ public static String TOTAL_SWAP_SPACE;
+ public static String TYPE;
+ public static String UNAVAILABLE;
+ public static String UNKNOWN_CAPITALIZED;
+ public static String UNKNOWN_HOST;
+ public static String UNREGISTER;
+ public static String UPTIME;
+ public static String USAGE_THRESHOLD;
+ public static String REMOTE_TF_USAGE;
+ public static String USED;
+ public static String USERNAME_COLON_;
+ public static String USERNAME_ACCESSIBLE_NAME;
+ public static String USER_DATA;
+ public static String VIRTUAL_MACHINE;
+ public static String VM_ARGUMENTS;
+ public static String VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION;
+ public static String VALUE;
+ public static String VENDOR;
+ public static String VERBOSE_OUTPUT;
+ public static String VERBOSE_OUTPUT_TOOLTIP;
+ public static String VIEW;
+ public static String WINDOW;
+ public static String WINDOWS;
+ public static String WRITABLE;
+ public static String CONNECTION_FAILED1;
+ public static String CONNECTION_FAILED2;
+ public static String CONNECTION_LOST1;
+ public static String CONNECTING_TO1;
+ public static String CONNECTING_TO2;
+ public static String DEADLOCK_TAB;
+ public static String DEADLOCK_TAB_N;
+ public static String EXPAND;
+ public static String KBYTES;
+ public static String PLOT;
+ public static String VISUALIZE;
+ public static String ZZ_USAGE_TEXT;
+}
diff --git a/src/share/classes/sun/tools/jconsole/OverviewPanel.java b/src/share/classes/sun/tools/jconsole/OverviewPanel.java
index 4603b97255d4de3f3a0dcbfc0a3c9fbb07b2b176..269dbd23205eb737554e4150b8371183b664779d 100644
--- a/src/share/classes/sun/tools/jconsole/OverviewPanel.java
+++ b/src/share/classes/sun/tools/jconsole/OverviewPanel.java
@@ -26,14 +26,12 @@
package sun.tools.jconsole;
import java.awt.*;
-import java.awt.event.*;
import javax.swing.*;
-import javax.swing.border.*;
+
import static javax.swing.SwingConstants.*;
import static sun.tools.jconsole.JConsole.*;
-import static sun.tools.jconsole.Resources.*;
import static sun.tools.jconsole.Utilities.*;
@@ -68,7 +66,7 @@ abstract class OverviewPanel extends PlotterPanel {
}
plotter.createSequence(plotterKey, plotterName, PLOTTER_COLOR, true);
setAccessibleName(plotter,
- getText("OverviewPanel.plotter.accessibleName",
+ Resources.format(Messages.OVERVIEW_PANEL_PLOTTER_ACCESSIBLE_NAME,
title));
setPlotter(plotter);
}
diff --git a/src/share/classes/sun/tools/jconsole/OverviewTab.java b/src/share/classes/sun/tools/jconsole/OverviewTab.java
index 74a14ecb6f85c4ecc89fd696c8d20d72d7cc6835..3b89f6e33c8e0da6f6f760ef35157c33f4c3d75b 100644
--- a/src/share/classes/sun/tools/jconsole/OverviewTab.java
+++ b/src/share/classes/sun/tools/jconsole/OverviewTab.java
@@ -26,15 +26,11 @@
package sun.tools.jconsole;
import java.awt.*;
-import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import javax.swing.*;
import javax.swing.border.*;
-import static sun.tools.jconsole.JConsole.*;
-import static sun.tools.jconsole.Resources.*;
-
@SuppressWarnings("serial")
class OverviewTab extends Tab {
@@ -42,7 +38,7 @@ class OverviewTab extends Tab {
TimeComboBox timeComboBox;
public static String getTabName() {
- return getText("Overview");
+ return Messages.OVERVIEW;
}
public OverviewTab(VMPanel vmPanel) {
@@ -58,8 +54,8 @@ class OverviewTab extends Tab {
topPanel.add(controlPanel, BorderLayout.CENTER);
timeComboBox = new TimeComboBox();
- LabeledComponent lc = new LabeledComponent(Resources.getText("Time Range:"),
- getMnemonicInt("Time Range:"),
+ LabeledComponent lc = new LabeledComponent(Messages.TIME_RANGE_COLON,
+ Resources.getMnemonicInt(Messages.TIME_RANGE_COLON),
timeComboBox);
controlPanel.add(lc);
diff --git a/src/share/classes/sun/tools/jconsole/Plotter.java b/src/share/classes/sun/tools/jconsole/Plotter.java
index 351187e51e08f3c17346042176d27963e756e347..a9dbeceb9993ab4115c97cf0756a82d4a19c0d02 100644
--- a/src/share/classes/sun/tools/jconsole/Plotter.java
+++ b/src/share/classes/sun/tools/jconsole/Plotter.java
@@ -38,14 +38,11 @@ import javax.swing.border.*;
import javax.swing.filechooser.*;
import javax.swing.filechooser.FileFilter;
-import com.sun.tools.jconsole.JConsoleContext;
-import static com.sun.tools.jconsole.JConsoleContext.ConnectionState.*;
+import com.sun.tools.jconsole.JConsoleContext;
import static sun.tools.jconsole.Formatter.*;
import static sun.tools.jconsole.ProxyClient.*;
-import static sun.tools.jconsole.Resources.*;
-import static sun.tools.jconsole.Utilities.*;
@SuppressWarnings("serial")
public class Plotter extends JComponent
@@ -56,22 +53,22 @@ public class Plotter extends JComponent
}
static final String[] rangeNames = {
- Resources.getText(" 1 min"),
- Resources.getText(" 5 min"),
- Resources.getText("10 min"),
- Resources.getText("30 min"),
- Resources.getText(" 1 hour"),
- Resources.getText(" 2 hours"),
- Resources.getText(" 3 hours"),
- Resources.getText(" 6 hours"),
- Resources.getText("12 hours"),
- Resources.getText(" 1 day"),
- Resources.getText(" 7 days"),
- Resources.getText(" 1 month"),
- Resources.getText(" 3 months"),
- Resources.getText(" 6 months"),
- Resources.getText(" 1 year"),
- Resources.getText("All")
+ Messages.ONE_MIN,
+ Messages.FIVE_MIN,
+ Messages.TEN_MIN,
+ Messages.THIRTY_MIN,
+ Messages.ONE_HOUR,
+ Messages.TWO_HOURS,
+ Messages.THREE_HOURS,
+ Messages.SIX_HOURS,
+ Messages.TWELVE_HOURS,
+ Messages.ONE_DAY,
+ Messages.SEVEN_DAYS,
+ Messages.ONE_MONTH,
+ Messages.THREE_MONTHS,
+ Messages.SIX_MONTHS,
+ Messages.ONE_YEAR,
+ Messages.ALL
};
static final int[] rangeValues = {
@@ -247,9 +244,9 @@ public class Plotter extends JComponent
@Override
public JPopupMenu getComponentPopupMenu() {
if (popupMenu == null) {
- popupMenu = new JPopupMenu(Resources.getText("Chart:"));
- timeRangeMenu = new JMenu(Resources.getText("Plotter.timeRangeMenu"));
- timeRangeMenu.setMnemonic(getMnemonicInt("Plotter.timeRangeMenu"));
+ popupMenu = new JPopupMenu(Messages.CHART_COLON);
+ timeRangeMenu = new JMenu(Messages.PLOTTER_TIME_RANGE_MENU);
+ timeRangeMenu.setMnemonic(Resources.getMnemonicInt(Messages.PLOTTER_TIME_RANGE_MENU));
popupMenu.add(timeRangeMenu);
menuRBs = new JRadioButtonMenuItem[rangeNames.length];
ButtonGroup rbGroup = new ButtonGroup();
@@ -265,8 +262,8 @@ public class Plotter extends JComponent
popupMenu.addSeparator();
- saveAsMI = new JMenuItem(getText("Plotter.saveAsMenuItem"));
- saveAsMI.setMnemonic(getMnemonicInt("Plotter.saveAsMenuItem"));
+ saveAsMI = new JMenuItem(Messages.PLOTTER_SAVE_AS_MENU_ITEM);
+ saveAsMI.setMnemonic(Resources.getMnemonicInt(Messages.PLOTTER_SAVE_AS_MENU_ITEM));
saveAsMI.addActionListener(this);
popupMenu.add(saveAsMI);
}
@@ -318,9 +315,9 @@ public class Plotter extends JComponent
out.close();
JOptionPane.showMessageDialog(this,
- getText("FileChooser.savedFile",
- file.getAbsolutePath(),
- file.length()));
+ Resources.format(Messages.FILE_CHOOSER_SAVED_FILE,
+ file.getAbsolutePath(),
+ file.length()));
} catch (IOException ex) {
String msg = ex.getLocalizedMessage();
String path = file.getAbsolutePath();
@@ -328,9 +325,10 @@ public class Plotter extends JComponent
msg = msg.substring(path.length()).trim();
}
JOptionPane.showMessageDialog(this,
- getText("FileChooser.saveFailed.message",
- path, msg),
- getText("FileChooser.saveFailed.title"),
+ Resources.format(Messages.FILE_CHOOSER_SAVE_FAILED_MESSAGE,
+ path,
+ msg),
+ Messages.FILE_CHOOSER_SAVE_FAILED_TITLE,
JOptionPane.ERROR_MESSAGE);
}
}
@@ -1020,13 +1018,13 @@ public class Plotter extends JComponent
}
if (file.exists()) {
- String okStr = getText("FileChooser.fileExists.okOption");
- String cancelStr = getText("FileChooser.fileExists.cancelOption");
+ String okStr = Messages.FILE_CHOOSER_FILE_EXISTS_OK_OPTION;
+ String cancelStr = Messages.FILE_CHOOSER_FILE_EXISTS_CANCEL_OPTION;
int ret =
JOptionPane.showOptionDialog(this,
- getText("FileChooser.fileExists.message",
- file.getName()),
- getText("FileChooser.fileExists.title"),
+ Resources.format(Messages.FILE_CHOOSER_FILE_EXISTS_MESSAGE,
+ file.getName()),
+ Messages.FILE_CHOOSER_FILE_EXISTS_TITLE,
JOptionPane.OK_CANCEL_OPTION,
JOptionPane.WARNING_MESSAGE,
null,
@@ -1053,7 +1051,7 @@ public class Plotter extends JComponent
protected class AccessiblePlotter extends AccessibleJComponent {
private static final long serialVersionUID = -3847205410473510922L;
protected AccessiblePlotter() {
- setAccessibleName(getText("Plotter.accessibleName"));
+ setAccessibleName(Messages.PLOTTER_ACCESSIBLE_NAME);
}
@Override
@@ -1067,7 +1065,7 @@ public class Plotter extends JComponent
String value = "null";
if (seq.size > 0) {
if (unit == Unit.BYTES) {
- value = getText("Size Bytes", seq.value(seq.size - 1));
+ value = Resources.format(Messages.SIZE_BYTES, seq.value(seq.size - 1));
} else {
value =
getFormattedValue(seq.value(seq.size - 1), false) +
@@ -1076,13 +1074,13 @@ public class Plotter extends JComponent
}
// Assume format string ends with newline
keyValueList +=
- getText("Plotter.accessibleName.keyAndValue",
+ Resources.format(Messages.PLOTTER_ACCESSIBLE_NAME_KEY_AND_VALUE,
seq.key, value);
}
}
name += "\n" + keyValueList + ".";
} else {
- name += "\n" + getText("Plotter.accessibleName.noData");
+ name += "\n" + Messages.PLOTTER_ACCESSIBLE_NAME_NO_DATA;
}
return name;
}
diff --git a/src/share/classes/sun/tools/jconsole/PlotterPanel.java b/src/share/classes/sun/tools/jconsole/PlotterPanel.java
index f9cc125935d1bfa344ab68ab5cffe5aeb3f3c3bd..da6b2cc3b6abeaf88131c26e20e2497ce98f4ce1 100644
--- a/src/share/classes/sun/tools/jconsole/PlotterPanel.java
+++ b/src/share/classes/sun/tools/jconsole/PlotterPanel.java
@@ -25,7 +25,6 @@
package sun.tools.jconsole;
-import java.awt.*;
import java.awt.event.*;
import javax.accessibility.*;
diff --git a/src/share/classes/sun/tools/jconsole/ProxyClient.java b/src/share/classes/sun/tools/jconsole/ProxyClient.java
index 6e129fd5569fe7c3890ad874b4ebf38c0a103c0b..d98d48952890d1f214475f091976fce1e3ddd2f0 100644
--- a/src/share/classes/sun/tools/jconsole/ProxyClient.java
+++ b/src/share/classes/sun/tools/jconsole/ProxyClient.java
@@ -27,7 +27,6 @@ package sun.tools.jconsole;
import com.sun.management.HotSpotDiagnosticMXBean;
import com.sun.tools.jconsole.JConsoleContext;
-import com.sun.tools.jconsole.JConsoleContext.ConnectionState;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeEvent;
import java.io.IOException;
@@ -504,7 +503,7 @@ public class ProxyClient implements JConsoleContext {
public String toString() {
if (!isConnected()) {
- return Resources.getText("ConnectionName (disconnected)", displayName);
+ return Resources.format(Messages.CONNECTION_NAME__DISCONNECTED_, displayName);
} else {
return displayName;
}
@@ -595,10 +594,10 @@ public class ProxyClient implements JConsoleContext {
assert(false);
}
}
- Set mbeans = server.queryNames(name, null);
+ Set mbeans = server.queryNames(name, null);
Map result =
new HashMap(mbeans.size());
- Iterator iterator = mbeans.iterator();
+ Iterator iterator = mbeans.iterator();
while (iterator.hasNext()) {
Object object = iterator.next();
if (object instanceof ObjectName) {
@@ -704,10 +703,10 @@ public class ProxyClient implements JConsoleContext {
// should not reach here
assert(false);
}
- Set mbeans = server.queryNames(poolName, null);
+ Set mbeans = server.queryNames(poolName, null);
if (mbeans != null) {
memoryPoolProxies = new ArrayList();
- Iterator iterator = mbeans.iterator();
+ Iterator iterator = mbeans.iterator();
while (iterator.hasNext()) {
ObjectName objName = (ObjectName) iterator.next();
MemoryPoolProxy p = new MemoryPoolProxy(this, objName);
@@ -730,10 +729,10 @@ public class ProxyClient implements JConsoleContext {
// should not reach here
assert(false);
}
- Set mbeans = server.queryNames(gcName, null);
+ Set mbeans = server.queryNames(gcName, null);
if (mbeans != null) {
garbageCollectorMBeans = new ArrayList();
- Iterator iterator = mbeans.iterator();
+ Iterator iterator = mbeans.iterator();
while (iterator.hasNext()) {
ObjectName on = (ObjectName) iterator.next();
String name = GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE +
diff --git a/src/share/classes/sun/tools/jconsole/Resources.java b/src/share/classes/sun/tools/jconsole/Resources.java
index 26e768b60afa8cc36f891b90805365ee603698bc..e7ced473ece57cc22b5c8159eb095b13db5277de 100644
--- a/src/share/classes/sun/tools/jconsole/Resources.java
+++ b/src/share/classes/sun/tools/jconsole/Resources.java
@@ -25,89 +25,185 @@
package sun.tools.jconsole;
+import java.awt.event.KeyEvent;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import sun.tools.jconsole.resources.JConsoleResources;
-
/**
- * Provides resource support for jconsole.
+ * Toolkit that provides resource support for JConsole.
*/
public final class Resources {
+ private static Map MNEMONIC_LOOKUP = Collections
+ .synchronizedMap(new HashMap());
+
+ private Resources() {
+ throw new AssertionError();
+ }
+
+ /**
+ * Convenience method for {@link MessageFormat#format(String, Object...)}.
+ *
+ * @param pattern the pattern
+ * @param objects the arguments for the pattern
+ *
+ * @return a formatted string
+ */
+ public static String format(String pattern, Object... arguments) {
+ return MessageFormat.format(pattern, arguments);
+ }
+
+ /**
+ * Returns the mnemonic for a message.
+ *
+ * @param message the message
+ *
+ * @return the mnemonic int
+ */
+ public static int getMnemonicInt(String message) {
+ Integer integer = MNEMONIC_LOOKUP.get(message);
+ if (integer != null) {
+ return integer.intValue();
+ }
+ return 0;
+ }
- private static final Object lock = new Object();
- private static JConsoleResources resources = null;
- static {
+ /**
+ * Initializes all non-final public static fields in the given class with
+ * messages from a {@link ResourceBundle}.
+ *
+ * @param clazz the class containing the fields
+ */
+ public static void initializeMessages(Class> clazz, String rbName) {
+ ResourceBundle rb = null;
try {
- resources =
- (JConsoleResources)ResourceBundle.getBundle("sun.tools.jconsole.resources.JConsoleResources");
- } catch (MissingResourceException e) {
- // gracefully handle this later
+ rb = ResourceBundle.getBundle(rbName);
+ } catch (MissingResourceException mre) {
+ // fall through, handled later
+ }
+ for (Field field : clazz.getFields()) {
+ if (isWritableField(field)) {
+ String key = field.getName();
+ String message = getMessage(rb, key);
+ int mnemonicInt = findMnemonicInt(message);
+ message = removeMnemonicAmpersand(message);
+ message = replaceWithPlatformLineFeed(message);
+ setFieldValue(field, message);
+ MNEMONIC_LOOKUP.put(message, mnemonicInt);
+ }
}
}
- private Resources() { throw new AssertionError(); }
+ private static boolean isWritableField(Field field) {
+ int modifiers = field.getModifiers();
+ return Modifier.isPublic(modifiers) && Modifier.isStatic(modifiers)
+ && !Modifier.isFinal(modifiers);
+ }
/**
- * Returns the text of the jconsole resource for the specified key
- * formatted with the specified arguments.
+ * Returns the message corresponding to the key in the bundle or a text
+ * describing it's missing.
*
+ * @param rb the resource bundle
+ * @param key the key
+ *
+ * @return the message
*/
- public static String getText(String key, Object... args) {
- String format = getString(key);
- if (format == null) {
- format = "missing resource key: key = \"" + key + "\", " +
- "arguments = \"{0}\", \"{1}\", \"{2}\"";
+ private static String getMessage(ResourceBundle rb, String key) {
+ if (rb == null) {
+ return "missing resource bundle";
+ }
+ try {
+ return rb.getString(key);
+ } catch (MissingResourceException mre) {
+ return "missing message for key = \"" + key
+ + "\" in resource bundle ";
}
- return formatMessage(format, args);
}
- static String formatMessage(String format, Object... args) {
- String ss = null;
- synchronized (lock) {
- /*
- * External synchronization required for safe use of
- * java.text.MessageFormat:
- */
- ss = MessageFormat.format(format, args);
+ private static void setFieldValue(Field field, String value) {
+ try {
+ field.set(null, value);
+ } catch (IllegalArgumentException | IllegalAccessException e) {
+ throw new Error("Unable to access or set message for field " + field.getName());
}
- return ss;
}
/**
- * Returns the mnemonic keycode int of the jconsole resource for the specified key.
+ * Returns a {@link String} where all \n in the have
+ * been replaced with the line separator for the platform.
+ *
+ * @param text the to be replaced
*
+ * @return the replaced text
*/
- public static int getMnemonicInt(String key) {
- int mnemonic = 0;
- if (resources != null) {
- Object obj = resources.getObject(key+".mnemonic");
- if (obj instanceof Character) {
- mnemonic = (int)(Character)obj;
- if (mnemonic >= 'a' && mnemonic <='z') {
- mnemonic -= ('a' - 'A');
- }
- } else if (obj instanceof Integer) {
- mnemonic = (Integer)obj;
+ private static String replaceWithPlatformLineFeed(String text) {
+ return text.replace("\n", System.getProperty("line.separator"));
+ }
+
+ /**
+ * Removes the mnemonic identifier (&) from a string unless
+ * it's escaped by && or placed at the end.
+ *
+ * @param message the message
+ *
+ * @return a message with the mnemonic identifier removed
+ */
+ private static String removeMnemonicAmpersand(String message) {
+ StringBuilder s = new StringBuilder();
+ for (int i = 0; i < message.length(); i++) {
+ char current = message.charAt(i);
+ if (current != '&' || i == message.length() - 1
+ || message.charAt(i + 1) == '&') {
+ s.append(current);
}
}
- return mnemonic;
+ return s.toString();
}
/**
- * Returns the jconsole resource string for the specified key.
+ * Finds the mnemonic character in a message.
+ *
+ * The mnemonic character is the first character followed by the first
+ * & that is not followed by another &.
*
+ * @return the mnemonic as an int, or 0 if it
+ * can't be found.
*/
- private static String getString(String key) {
- if (resources != null) {
- try {
- return resources.getString(key);
- } catch (MissingResourceException e) {
- return null;
+ private static int findMnemonicInt(String s) {
+ for (int i = 0; i < s.length() - 1; i++) {
+ if (s.charAt(i) == '&') {
+ if (s.charAt(i + 1) != '&') {
+ return lookupMnemonicInt(s.substring(i + 1, i + 2));
+ } else {
+ i++;
+ }
}
}
- return "missing resource bundle: key = \"" + key + "\", " +
- "arguments = \"{0}\", \"{1}\", \"{2}\"";
+ return 0;
+ }
+
+ /**
+ * Lookups the mnemonic for a key in the {@link KeyEvent} class.
+ *
+ * @param c the character to lookup
+ *
+ * @return the mnemonic as an int, or 0 if it
+ * can't be found.
+ */
+ private static int lookupMnemonicInt(String c) {
+ try {
+ return KeyEvent.class.getDeclaredField("VK_" + c.toUpperCase())
+ .getInt(null);
+ } catch (IllegalArgumentException | IllegalAccessException
+ | NoSuchFieldException | SecurityException e) {
+ // Missing VK is okay
+ return 0;
+ }
}
}
diff --git a/src/share/classes/sun/tools/jconsole/SummaryTab.java b/src/share/classes/sun/tools/jconsole/SummaryTab.java
index 5e1907f1cb837b9142229a64e116a7d127dca2fa..e51110085e91612ae91e39b8fb3a79d653fab15f 100644
--- a/src/share/classes/sun/tools/jconsole/SummaryTab.java
+++ b/src/share/classes/sun/tools/jconsole/SummaryTab.java
@@ -29,24 +29,19 @@ import java.awt.*;
import java.io.*;
import java.lang.management.*;
import java.lang.reflect.*;
-import java.net.URL;
import java.text.*;
import java.util.*;
import java.util.concurrent.*;
import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.text.*;
+
import static sun.tools.jconsole.Formatter.*;
-import static sun.tools.jconsole.Resources.*;
import static sun.tools.jconsole.Utilities.*;
@SuppressWarnings("serial")
class SummaryTab extends Tab {
private static final String cpuUsageKey = "cpu";
- private static final String cpuUsageName = getText("CPU Usage");
- private static final String cpuUsageFormat = "CPUUsageFormat";
private static final String newDivider = " ";
private static final String newTable = "";
@@ -70,7 +65,7 @@ class SummaryTab extends Tab {
}
public static String getTabName() {
- return Resources.getText("SummaryTab.tabName");
+ return Messages.SUMMARY_TAB_TAB_NAME;
}
public SummaryTab(VMPanel vmPanel) {
@@ -83,7 +78,7 @@ class SummaryTab extends Tab {
add(new JScrollPane(info));
headerDateTimeFormat =
- getDateTimeFormat("SummaryTab.headerDateTimeFormat");
+ Formatter.getDateTimeFormat(Messages.SUMMARY_TAB_HEADER_DATE_TIME_FORMAT);
}
public SwingWorker, ?> newSwingWorker() {
@@ -138,7 +133,7 @@ class SummaryTab extends Tab {
proxyClient.getSunOperatingSystemMXBean();
append("");
- append("" + getText("SummaryTab.tabName") + "");
+ append("" + Messages.SUMMARY_TAB_TAB_NAME + "");
String dateTime =
headerDateTimeFormat.format(System.currentTimeMillis());
append("" + dateTime + "");
@@ -147,30 +142,30 @@ class SummaryTab extends Tab {
{ // VM info
append(newLeftTable);
- append("Connection name", vmPanel.getDisplayName());
- append("Virtual Machine",
- getText("SummaryTab.vmVersion",
- rmBean.getVmName(), rmBean.getVmVersion()));
- append("Vendor", rmBean.getVmVendor());
- append("Name", rmBean.getName());
+ append(Messages.CONNECTION_NAME, vmPanel.getDisplayName());
+ append(Messages.VIRTUAL_MACHINE,
+ Resources.format(Messages.SUMMARY_TAB_VM_VERSION,
+ rmBean.getVmName(), rmBean.getVmVersion()));
+ append(Messages.VENDOR, rmBean.getVmVendor());
+ append(Messages.NAME, rmBean.getName());
append(endTable);
append(newRightTable);
result.upTime = rmBean.getUptime();
- append("Uptime", formatTime(result.upTime));
+ append(Messages.UPTIME, formatTime(result.upTime));
if (sunOSMBean != null) {
result.processCpuTime = sunOSMBean.getProcessCpuTime();
- append("Process CPU time", formatNanoTime(result.processCpuTime));
+ append(Messages.PROCESS_CPU_TIME, formatNanoTime(result.processCpuTime));
}
if (cmpMBean != null) {
- append("JIT compiler", cmpMBean.getName());
- append("Total compile time",
+ append(Messages.JIT_COMPILER, cmpMBean.getName());
+ append(Messages.TOTAL_COMPILE_TIME,
cmpMBean.isCompilationTimeMonitoringSupported()
? formatTime(cmpMBean.getTotalCompilationTime())
- : getText("Unavailable"));
+ : Messages.UNAVAILABLE);
} else {
- append("JIT compiler", getText("Unavailable"));
+ append(Messages.JIT_COMPILER, Messages.UNAVAILABLE);
}
append(endTable);
}
@@ -185,10 +180,10 @@ class SummaryTab extends Tab {
long ttCount = tmBean.getTotalStartedThreadCount();
String[] strings1 = formatLongs(tlCount, tpCount,
tdCount, ttCount);
- append("Live Threads", strings1[0]);
- append("Peak", strings1[1]);
- append("Daemon threads", strings1[2]);
- append("Total threads started", strings1[3]);
+ append(Messages.LIVE_THREADS, strings1[0]);
+ append(Messages.PEAK, strings1[1]);
+ append(Messages.DAEMON_THREADS, strings1[2]);
+ append(Messages.TOTAL_THREADS_STARTED, strings1[3]);
append(endTable);
append(newRightTable);
@@ -196,9 +191,9 @@ class SummaryTab extends Tab {
long cuCount = clMBean.getUnloadedClassCount();
long ctCount = clMBean.getTotalLoadedClassCount();
String[] strings2 = formatLongs(clCount, cuCount, ctCount);
- append("Current classes loaded", strings2[0]);
- append("Total classes loaded", strings2[2]);
- append("Total classes unloaded", strings2[1]);
+ append(Messages.CURRENT_CLASSES_LOADED, strings2[0]);
+ append(Messages.TOTAL_CLASSES_LOADED, strings2[2]);
+ append(Messages.TOTAL_CLASSES_UNLOADED, strings2[1]);
append(null, "");
append(endTable);
}
@@ -210,16 +205,16 @@ class SummaryTab extends Tab {
append(newLeftTable);
String[] strings1 = formatKByteStrings(u.getUsed(), u.getMax());
- append("Current heap size", strings1[0]);
- append("Maximum heap size", strings1[1]);
+ append(Messages.CURRENT_HEAP_SIZE, strings1[0]);
+ append(Messages.MAXIMUM_HEAP_SIZE, strings1[1]);
append(endTable);
append(newRightTable);
String[] strings2 = formatKByteStrings(u.getCommitted());
- append("Committed memory", strings2[0]);
- append("SummaryTab.pendingFinalization.label",
- getText("SummaryTab.pendingFinalization.value",
- memoryBean.getObjectPendingFinalizationCount()));
+ append(Messages.COMMITTED_MEMORY, strings2[0]);
+ append(Messages.SUMMARY_TAB_PENDING_FINALIZATION_LABEL,
+ Messages.SUMMARY_TAB_PENDING_FINALIZATION_VALUE,
+ memoryBean.getObjectPendingFinalizationCount());
append(endTable);
append(newTable);
@@ -230,10 +225,10 @@ class SummaryTab extends Tab {
long gcCount = garbageCollectorMBean.getCollectionCount();
long gcTime = garbageCollectorMBean.getCollectionTime();
- append("Garbage collector",
- getText("GcInfo", gcName, gcCount,
- (gcTime >= 0) ? formatTime(gcTime)
- : getText("Unavailable")),
+ append(Messages.GARBAGE_COLLECTOR,
+ Resources.format(Messages.GC_INFO, gcName, gcCount,
+ (gcTime >= 0) ? formatTime(gcTime)
+ : Messages.UNAVAILABLE),
4);
}
append(endTable);
@@ -247,9 +242,9 @@ class SummaryTab extends Tab {
String osVersion = osMBean.getVersion();
String osArch = osMBean.getArch();
result.nCPUs = osMBean.getAvailableProcessors();
- append("Operating System", osName + " " + osVersion);
- append("Architecture", osArch);
- append("Number of processors", result.nCPUs+"");
+ append(Messages.OPERATING_SYSTEM, osName + " " + osVersion);
+ append(Messages.ARCHITECTURE, osArch);
+ append(Messages.NUMBER_OF_PROCESSORS, result.nCPUs+"");
if (pathSeparator == null) {
// Must use separator of remote OS, not File.pathSeparator
@@ -268,14 +263,14 @@ class SummaryTab extends Tab {
sunOSMBean.getTotalSwapSpaceSize(),
sunOSMBean.getFreeSwapSpaceSize());
- append("Committed virtual memory", kbStrings1[0]);
+ append(Messages.COMMITTED_VIRTUAL_MEMORY, kbStrings1[0]);
append(endTable);
append(newRightTable);
- append("Total physical memory", kbStrings2[0]);
- append("Free physical memory", kbStrings2[1]);
- append("Total swap space", kbStrings2[2]);
- append("Free swap space", kbStrings2[3]);
+ append(Messages.TOTAL_PHYSICAL_MEMORY, kbStrings2[0]);
+ append(Messages.FREE_PHYSICAL_MEMORY, kbStrings2[1]);
+ append(Messages.TOTAL_SWAP_SPACE, kbStrings2[2]);
+ append(Messages.FREE_SWAP_SPACE, kbStrings2[3]);
}
append(endTable);
@@ -290,13 +285,13 @@ class SummaryTab extends Tab {
for (String arg : inputArguments) {
args += arg + " ";
}
- append("VM arguments", args, 4);
- append("Class path", rmBean.getClassPath(), 4);
- append("Library path", rmBean.getLibraryPath(), 4);
- append("Boot class path",
+ append(Messages.VM_ARGUMENTS, args, 4);
+ append(Messages.CLASS_PATH, rmBean.getClassPath(), 4);
+ append(Messages.LIBRARY_PATH, rmBean.getLibraryPath(), 4);
+ append(Messages.BOOT_CLASS_PATH,
rmBean.isBootClassPathSupported()
? rmBean.getBootClassPath()
- : getText("Unavailable"),
+ : Messages.UNAVAILABLE,
4);
append(endTable);
}
@@ -327,7 +322,7 @@ class SummaryTab extends Tab {
}
void append(String label, String value) {
- append(newRow((label != null) ? getText(label) : label, value));
+ append(newRow(label, value));
}
private void append(String label, String value, int columnPerRow) {
@@ -335,13 +330,7 @@ class SummaryTab extends Tab {
value = value.replace(pathSeparator,
"" + pathSeparator);
}
- append(newRow(getText(label), value, columnPerRow));
- }
-
- void append(String label1, String value1,
- String label2, String value2) {
- append(newRow(getText(label1), value1,
- getText(label2), value2));
+ append(newRow(label, value, columnPerRow));
}
OverviewPanel[] getOverviewPanels() {
@@ -355,7 +344,7 @@ class SummaryTab extends Tab {
private long prevUpTime, prevProcessCpuTime;
CPUOverviewPanel() {
- super(getText("CPU Usage"), cpuUsageKey, cpuUsageName, Plotter.Unit.PERCENT);
+ super(Messages.CPU_USAGE, cpuUsageKey, Messages.CPU_USAGE, Plotter.Unit.PERCENT);
getPlotter().setDecimals(CPU_DECIMALS);
}
@@ -373,14 +362,11 @@ class SummaryTab extends Tab {
getPlotter().addValues(result.timeStamp,
Math.round(cpuUsage * Math.pow(10.0, CPU_DECIMALS)));
- getInfoLabel().setText(getText(cpuUsageFormat,
+ getInfoLabel().setText(Resources.format(Messages.CPU_USAGE_FORMAT,
String.format("%."+CPU_DECIMALS+"f", cpuUsage)));
}
this.prevUpTime = result.upTime;
this.prevProcessCpuTime = result.processCpuTime;
}
}
-
-
-
}
diff --git a/src/share/classes/sun/tools/jconsole/Tab.java b/src/share/classes/sun/tools/jconsole/Tab.java
index 32ac8d6d0be07891a3cd8bebc6f88b12dc0e308c..512cc6be5d86f0d4732a314055a9a9a274137c4a 100644
--- a/src/share/classes/sun/tools/jconsole/Tab.java
+++ b/src/share/classes/sun/tools/jconsole/Tab.java
@@ -26,9 +26,6 @@
package sun.tools.jconsole;
import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
-
import javax.swing.*;
public abstract class Tab extends JPanel {
diff --git a/src/share/classes/sun/tools/jconsole/ThreadTab.java b/src/share/classes/sun/tools/jconsole/ThreadTab.java
index 16a461cbb31113487e6682723d884853ee70eb0b..d1cb677efefdb08e82a4c4ce46d5e83b822feae0 100644
--- a/src/share/classes/sun/tools/jconsole/ThreadTab.java
+++ b/src/share/classes/sun/tools/jconsole/ThreadTab.java
@@ -35,14 +35,11 @@ import javax.swing.*;
import javax.swing.border.*;
import javax.swing.event.*;
+
import java.util.*;
import java.util.concurrent.*;
import java.util.List;
-import sun.awt.*;
-
-import static sun.tools.jconsole.OverviewPanel.*;
-import static sun.tools.jconsole.Resources.*;
import static sun.tools.jconsole.Utilities.*;
@@ -51,7 +48,7 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
PlotterPanel threadMeter;
TimeComboBox timeComboBox;
JTabbedPane threadListTabbedPane;
- DefaultListModel listModel;
+ DefaultListModel listModel;
JTextField filterTF;
JLabel messageLabel;
JSplitPane threadsSplitPane;
@@ -64,9 +61,6 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
private static final String threadCountKey = "threadCount";
private static final String peakKey = "peak";
- private static final String threadCountName = Resources.getText("Live Threads");
- private static final String peakName = Resources.getText("Peak");
-
private static final Color threadCountColor = Plotter.defaultColor;
private static final Color peakColor = Color.red;
@@ -93,7 +87,7 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
public static String getTabName() {
- return Resources.getText("Threads");
+ return Messages.THREADS;
}
public ThreadTab(VMPanel vmPanel) {
@@ -111,28 +105,28 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
JPanel controlPanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 20, 5));
topPanel.add(controlPanel, BorderLayout.CENTER);
- threadMeter = new PlotterPanel(Resources.getText("Number of Threads"),
+ threadMeter = new PlotterPanel(Messages.NUMBER_OF_THREADS,
Plotter.Unit.NONE, true);
- threadMeter.plotter.createSequence(threadCountKey, threadCountName, threadCountColor, true);
- threadMeter.plotter.createSequence(peakKey, peakName, peakColor, true);
+ threadMeter.plotter.createSequence(threadCountKey, Messages.LIVE_THREADS, threadCountColor, true);
+ threadMeter.plotter.createSequence(peakKey, Messages.PEAK, peakColor, true);
setAccessibleName(threadMeter.plotter,
- getText("ThreadTab.threadPlotter.accessibleName"));
+ Messages.THREAD_TAB_THREAD_PLOTTER_ACCESSIBLE_NAME);
plotterPanel.add(threadMeter);
timeComboBox = new TimeComboBox(threadMeter.plotter);
- controlPanel.add(new LabeledComponent(Resources.getText("Time Range:"),
- getMnemonicInt("Time Range:"),
+ controlPanel.add(new LabeledComponent(Messages.TIME_RANGE_COLON,
+ Resources.getMnemonicInt(Messages.TIME_RANGE_COLON),
timeComboBox));
- listModel = new DefaultListModel();
+ listModel = new DefaultListModel();
JTextArea textArea = new JTextArea();
textArea.setBorder(thinEmptyBorder);
textArea.setEditable(false);
setAccessibleName(textArea,
- getText("ThreadTab.threadInfo.accessibleName"));
- JList list = new ThreadJList(listModel, textArea);
+ Messages.THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME);
+ ThreadJList list = new ThreadJList(listModel, textArea);
Dimension di = new Dimension(super.getPreferredSize());
di.width = Math.min(di.width, 200);
@@ -165,11 +159,11 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
filterTF.getPreferredSize().height));
firstTabToolPanel.add(separator);
- JButton detectDeadlockButton = new JButton(Resources.getText("Detect Deadlock"));
- detectDeadlockButton.setMnemonic(getMnemonicInt("Detect Deadlock"));
+ JButton detectDeadlockButton = new JButton(Messages.DETECT_DEADLOCK);
+ detectDeadlockButton.setMnemonic(Resources.getMnemonicInt(Messages.DETECT_DEADLOCK));
detectDeadlockButton.setActionCommand("detectDeadlock");
detectDeadlockButton.addActionListener(this);
- detectDeadlockButton.setToolTipText(getText("Detect Deadlock.toolTip"));
+ detectDeadlockButton.setToolTipText(Messages.DETECT_DEADLOCK_TOOLTIP);
firstTabToolPanel.add(detectDeadlockButton);
messageLabel = new JLabel();
@@ -177,7 +171,7 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
firstTabPanel.add(threadsSplitPane, BorderLayout.CENTER);
firstTabPanel.add(firstTabToolPanel, BorderLayout.SOUTH);
- threadListTabbedPane.addTab(Resources.getText("Threads"), firstTabPanel);
+ threadListTabbedPane.addTab(Messages.THREADS, firstTabPanel);
plotterPanel.add(threadListTabbedPane);
}
@@ -356,32 +350,32 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
}
if (ti != null) {
if (ti.getLockName() == null) {
- sb.append(Resources.getText("Name State",
+ sb.append(Resources.format(Messages.NAME_STATE,
ti.getThreadName(),
ti.getThreadState().toString()));
} else if (ti.getLockOwnerName() == null) {
- sb.append(Resources.getText("Name State LockName",
+ sb.append(Resources.format(Messages.NAME_STATE_LOCK_NAME,
ti.getThreadName(),
ti.getThreadState().toString(),
ti.getLockName()));
} else {
- sb.append(Resources.getText("Name State LockName LockOwner",
+ sb.append(Resources.format(Messages.NAME_STATE_LOCK_NAME_LOCK_OWNER,
ti.getThreadName(),
ti.getThreadState().toString(),
ti.getLockName(),
ti.getLockOwnerName()));
}
- sb.append(Resources.getText("BlockedCount WaitedCount",
+ sb.append(Resources.format(Messages.BLOCKED_COUNT_WAITED_COUNT,
ti.getBlockedCount(),
ti.getWaitedCount()));
- sb.append(Resources.getText("Stack trace"));
+ sb.append(Messages.STACK_TRACE);
int index = 0;
for (StackTraceElement e : ti.getStackTrace()) {
sb.append(e.toString()+"\n");
if (monitors != null) {
for (MonitorInfo mi : monitors) {
if (mi.getLockedStackDepth() == index) {
- sb.append(Resources.getText("Monitor locked", mi.toString()));
+ sb.append(Resources.format(Messages.MONITOR_LOCKED, mi.toString()));
}
}
}
@@ -429,7 +423,7 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
try {
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
- String msg = Resources.getText("No deadlock detected");
+ String msg = Messages.NO_DEADLOCK_DETECTED;
messageLabel.setText(msg);
threadListTabbedPane.revalidate();
}
@@ -459,13 +453,13 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
if (deadlockedThreads != null) {
for (int i = 0; i < deadlockedThreads.length; i++) {
- DefaultListModel listModel = new DefaultListModel();
+ DefaultListModel listModel = new DefaultListModel();
JTextArea textArea = new JTextArea();
textArea.setBorder(thinEmptyBorder);
textArea.setEditable(false);
setAccessibleName(textArea,
- getText("ThreadTab.threadInfo.accessibleName"));
- JList list = new ThreadJList(listModel, textArea);
+ Messages.THREAD_TAB_THREAD_INFO_ACCESSIBLE_NAME);
+ ThreadJList list = new ThreadJList(listModel, textArea);
JScrollPane threadlistSP = new JScrollPane(list);
JScrollPane textAreaSP = new JScrollPane(textArea);
threadlistSP.setBorder(null);
@@ -477,9 +471,9 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
splitPane.setDividerLocation(threadsSplitPane.getDividerLocation());
String tabName;
if (deadlockedThreads.length > 1) {
- tabName = Resources.getText("deadlockTabN", i+1);
+ tabName = Resources.format(Messages.DEADLOCK_TAB_N, i+1);
} else {
- tabName = Resources.getText("deadlockTab");
+ tabName = Messages.DEADLOCK_TAB;
}
threadListTabbedPane.addTab(tabName, splitPane);
@@ -591,10 +585,10 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
- private class ThreadJList extends JList {
+ private class ThreadJList extends JList {
private JTextArea textArea;
- ThreadJList(DefaultListModel listModel, JTextArea textArea) {
+ ThreadJList(DefaultListModel listModel, JTextArea textArea) {
super(listModel);
this.textArea = textArea;
@@ -603,7 +597,7 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
addListSelectionListener(ThreadTab.this);
setCellRenderer(new DefaultListCellRenderer() {
- public Component getListCellRendererComponent(JList list, Object value, int index,
+ public Component getListCellRendererComponent(JList> list, Object value, int index,
boolean isSelected, boolean cellHasFocus) {
super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
@@ -691,12 +685,12 @@ class ThreadTab extends Tab implements ActionListener, DocumentListener, ListSel
private static class ThreadOverviewPanel extends OverviewPanel {
ThreadOverviewPanel() {
- super(getText("Threads"), threadCountKey, threadCountName, null);
+ super(Messages.THREADS, threadCountKey, Messages.LIVE_THREADS, null);
}
private void updateThreadsInfo(long tlCount, long tpCount, long ttCount, long timeStamp) {
getPlotter().addValues(timeStamp, tlCount);
- getInfoLabel().setText(getText(infoLabelFormat, tlCount, tpCount, ttCount));
+ getInfoLabel().setText(Resources.format(infoLabelFormat, tlCount, tpCount, ttCount));
}
}
}
diff --git a/src/share/classes/sun/tools/jconsole/VMInternalFrame.java b/src/share/classes/sun/tools/jconsole/VMInternalFrame.java
index cb38e8c902c739a75d917f428cad85e91ce2c426..750d444c2fefd147e4c0aca375483329da8b143c 100644
--- a/src/share/classes/sun/tools/jconsole/VMInternalFrame.java
+++ b/src/share/classes/sun/tools/jconsole/VMInternalFrame.java
@@ -26,16 +26,9 @@
package sun.tools.jconsole;
import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-
import javax.swing.*;
-import javax.swing.Timer;
-import javax.swing.border.*;
-import javax.swing.event.*;
-import static sun.tools.jconsole.Resources.*;
+
import static sun.tools.jconsole.Utilities.*;
@SuppressWarnings("serial")
@@ -47,7 +40,7 @@ public class VMInternalFrame extends MaximizableInternalFrame {
this.vmPanel = vmPanel;
setAccessibleDescription(this,
- getText("VMInternalFrame.accessibleDescription"));
+ Messages.VMINTERNAL_FRAME_ACCESSIBLE_DESCRIPTION);
getContentPane().add(vmPanel, BorderLayout.CENTER);
pack();
vmPanel.updateFrameTitle();
diff --git a/src/share/classes/sun/tools/jconsole/VMPanel.java b/src/share/classes/sun/tools/jconsole/VMPanel.java
index ebaf1700159bdfeddbaf4d1b31fc4ee90d97aec5..d9072b0ac6ac8110ef62491b353bd6ea9a666b71 100644
--- a/src/share/classes/sun/tools/jconsole/VMPanel.java
+++ b/src/share/classes/sun/tools/jconsole/VMPanel.java
@@ -28,18 +28,16 @@ package sun.tools.jconsole;
import java.awt.*;
import java.awt.event.*;
import java.beans.*;
-import java.io.*;
import java.lang.reflect.*;
import java.util.*;
import java.util.List;
import java.util.Timer;
-
import javax.swing.*;
import javax.swing.plaf.*;
+
import com.sun.tools.jconsole.JConsolePlugin;
import com.sun.tools.jconsole.JConsoleContext;
-import static com.sun.tools.jconsole.JConsoleContext.ConnectionState.*;
import static sun.tools.jconsole.ProxyClient.*;
@@ -51,13 +49,10 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
private int updateInterval;
private String hostName;
private int port;
- private int vmid;
private String userName;
private String password;
private String url;
private VMInternalFrame vmIF = null;
- private static final String windowsLaF =
- "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
private static ArrayList tabInfos = new ArrayList();
private boolean wasConnected = false;
@@ -100,7 +95,6 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
this.updateInterval = updateInterval;
this.hostName = proxyClient.getHostName();
this.port = proxyClient.getPort();
- this.vmid = proxyClient.getVmid();
this.userName = proxyClient.getUserName();
this.password = proxyClient.getPassword();
this.url = proxyClient.getUrl();
@@ -186,9 +180,9 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
public String getToolTipText(MouseEvent event) {
if (connectedIconBounds.contains(event.getPoint())) {
if (isConnected()) {
- return getText("Connected. Click to disconnect.");
+ return Messages.CONNECTED_PUNCTUATION_CLICK_TO_DISCONNECT_;
} else {
- return getText("Disconnected. Click to connect.");
+ return Messages.DISCONNECTED_PUNCTUATION_CLICK_TO_CONNECT_;
}
} else {
return super.getToolTipText(event);
@@ -219,7 +213,7 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
private Tab instantiate(TabInfo tabInfo) {
try {
- Constructor con = tabInfo.tabClass.getConstructor(VMPanel.class);
+ Constructor> con = tabInfo.tabClass.getConstructor(VMPanel.class);
return (Tab) con.newInstance(this);
} catch (Exception ex) {
System.err.println(ex);
@@ -354,7 +348,7 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
private void onConnecting() {
time0 = System.currentTimeMillis();
- final JConsole jc = (JConsole) SwingUtilities.getWindowAncestor(this);
+ SwingUtilities.getWindowAncestor(this);
String connectionName = getConnectionName();
progressBar = new JProgressBar();
@@ -363,9 +357,9 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
progressPanel.add(progressBar);
Object[] message = {
- "" + getText("connectingTo1", connectionName) + "",
+ "" + Resources.format(Messages.CONNECTING_TO1, connectionName) + "",
progressPanel,
- "" + getText("connectingTo2", connectionName) + ""
+ "" + Resources.format(Messages.CONNECTING_TO2, connectionName) + ""
};
optionPane =
@@ -373,7 +367,7 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
message,
JOptionPane.DEFAULT_OPTION,
JOptionPane.INFORMATION_MESSAGE, null,
- new String[]{getText("Cancel")},
+ new String[]{Messages.CANCEL},
0);
@@ -409,7 +403,7 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
if (vmIF != null) {
String displayName = getDisplayName();
if (!proxyClient.isConnected()) {
- displayName = getText("ConnectionName (disconnected)", displayName);
+ displayName = Resources.format(Messages.CONNECTION_NAME__DISCONNECTED_, displayName);
}
vmIF.setTitle(displayName);
}
@@ -458,25 +452,18 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
private void vmPanelDied() {
disconnect();
- final JConsole jc = (JConsole) SwingUtilities.getWindowAncestor(this);
-
JOptionPane optionPane;
-
- final String connectStr = getText("Connect");
- final String reconnectStr = getText("Reconnect");
- final String cancelStr = getText("Cancel");
-
String msgTitle, msgExplanation, buttonStr;
if (wasConnected) {
wasConnected = false;
- msgTitle = getText("connectionLost1");
- msgExplanation = getText("connectionLost2", getConnectionName());
- buttonStr = reconnectStr;
+ msgTitle = Messages.CONNECTION_LOST1;
+ msgExplanation = Resources.format(Messages.CONNECTING_TO2, getConnectionName());
+ buttonStr = Messages.RECONNECT;
} else {
- msgTitle = getText("connectionFailed1");
- msgExplanation = getText("connectionFailed2", getConnectionName());
- buttonStr = connectStr;
+ msgTitle =Messages.CONNECTION_FAILED1;
+ msgExplanation = Resources.format(Messages.CONNECTION_FAILED2, getConnectionName());
+ buttonStr = Messages.CONNECT;
}
optionPane =
@@ -485,7 +472,7 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
"" + msgExplanation + "",
JOptionPane.DEFAULT_OPTION,
JOptionPane.WARNING_MESSAGE, null,
- new String[]{buttonStr, cancelStr},
+ new String[]{buttonStr, Messages.CANCEL},
0);
optionPane.addPropertyChangeListener(new PropertyChangeListener() {
@@ -494,7 +481,7 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
if (event.getPropertyName().equals(JOptionPane.VALUE_PROPERTY)) {
Object value = event.getNewValue();
- if (value == reconnectStr || value == connectStr) {
+ if (value == Messages.RECONNECT || value == Messages.CONNECT) {
connect();
} else if (!everConnected) {
try {
@@ -643,11 +630,6 @@ public class VMPanel extends JTabbedPane implements PropertyChangeListener {
}
}
- // Convenience methods
- private static String getText(String key, Object... args) {
- return Resources.getText(key, args);
- }
-
private void createPluginTabs() {
// add plugin tabs if not done
if (!pluginTabsAdded) {
diff --git a/src/share/classes/sun/tools/jconsole/VariableGridLayout.java b/src/share/classes/sun/tools/jconsole/VariableGridLayout.java
index 3cf55b0c1b26d02408a29afe644da8b2e4e15cb0..2d5851ce3b0c8b741e1c555059a514a28af53b2c 100644
--- a/src/share/classes/sun/tools/jconsole/VariableGridLayout.java
+++ b/src/share/classes/sun/tools/jconsole/VariableGridLayout.java
@@ -26,7 +26,6 @@
package sun.tools.jconsole;
import java.awt.*;
-import java.util.*;
import javax.swing.*;
diff --git a/src/share/classes/sun/tools/jconsole/Version.java.template b/src/share/classes/sun/tools/jconsole/Version.java.template
index b768be87890f54444ba4224317d968872c28ee81..f52ac6576229496772192e224d49068970a6ea87 100644
--- a/src/share/classes/sun/tools/jconsole/Version.java.template
+++ b/src/share/classes/sun/tools/jconsole/Version.java.template
@@ -26,6 +26,7 @@
package sun.tools.jconsole;
import java.io.PrintStream;
+import sun.tools.jconsole.Messages;
public class Version {
private static final String jconsole_version =
@@ -34,19 +35,19 @@ public class Version {
public static void print(PrintStream ps) {
printFullVersion(ps);
- ps.println(Resources.getText("Name and Build",
- System.getProperty("java.runtime.name"),
- System.getProperty("java.runtime.version")));
+ ps.println(Resources.format(Messages.NAME_AND_BUILD,
+ System.getProperty("java.runtime.name"),
+ System.getProperty("java.runtime.version")));
- ps.println(Resources.getText("Name Build and Mode",
- System.getProperty("java.vm.name"),
- System.getProperty("java.vm.version"),
- System.getProperty("java.vm.info")));
+ ps.println(Resources.format(Messages.NAME_AND_BUILD,
+ System.getProperty("java.vm.name"),
+ System.getProperty("java.vm.version"),
+ System.getProperty("java.vm.info")));
}
public static void printFullVersion(PrintStream ps) {
- ps.println(Resources.getText("JConsole version", jconsole_version));
+ ps.println(Resources.format(Messages.JCONSOLE_VERSION, jconsole_version));
}
static String getVersion() {
diff --git a/src/share/classes/sun/tools/jconsole/inspector/OperationEntry.java b/src/share/classes/sun/tools/jconsole/inspector/OperationEntry.java
index 4ada1cd5db3dfaadc0b6118ac9685d296d96e4d5..30dde2be106a63501ddfc5f9a8798bb9ae329f26 100644
--- a/src/share/classes/sun/tools/jconsole/inspector/OperationEntry.java
+++ b/src/share/classes/sun/tools/jconsole/inspector/OperationEntry.java
@@ -25,30 +25,14 @@
package sun.tools.jconsole.inspector;
-// java import
import java.awt.*;
-import java.awt.event.*;
-import java.awt.dnd.*;
-import java.lang.reflect.*;
-import java.io.*;
-//
-
-// swing import
-import javax.swing.border.*;
-import javax.swing.event.*;
import javax.swing.*;
-//
-
-// jmx import
import javax.management.*;
-//
-
@SuppressWarnings("serial")
public class OperationEntry extends JPanel {
private MBeanOperationInfo operation;
private JComboBox sigs;
- private Dimension preferredSize;
private XTextField inputs[];
public OperationEntry (MBeanOperationInfo operation,
@@ -61,26 +45,10 @@ public class OperationEntry extends JPanel {
setPanel(isCallable, button, xoperations);
}
- /**
- * This method chops off the throws exceptions, removes "java.lang".
- */
- private String preProcessSignature(String signature) {
- int index;
- if ((index=signature.indexOf(" throws"))>0) {
- signature = signature.substring(0,index);
- }
- while ((index = signature.indexOf("java.lang."))>0) {
- signature = signature.substring(0,index)+
- signature.substring(index+10,signature.length());
- }
- return signature;
- }
-
- private void setPanel(boolean isCallable,
+ private void setPanel(boolean isCallable,
JButton button,
XOperations xoperations) {
try {
- String defaultVal;
MBeanParameterInfo params[] = operation.getSignature();
add(new JLabel("(",JLabel.CENTER));
inputs = new XTextField[params.length];
diff --git a/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java b/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java
index 4894d4a68ff1a11e2257d4fe5220dd63e151682c..b89ab728a7b8e88a642616bf0fd72c37e762ff31 100644
--- a/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java
+++ b/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java
@@ -94,7 +94,7 @@ public class TableSorter extends DefaultTableModel implements MouseListener {
@SuppressWarnings("unchecked")
private int compare(Object o1, Object o2) {
// take care of the case where both o1 & o2 are null. Needed to keep
- // the method symetric. Without this quickSort gives surprising results.
+ // the method symmetric. Without this quickSort gives surprising results.
if (o1 == o2)
return 0;
if (o1==null)
diff --git a/src/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java b/src/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java
index d7b60958382f05ff1d77ed5a7037efd45de6ecc3..dbcdd63ca856aa1c696c7e2e6b22ece9a31b6d0c 100644
--- a/src/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java
+++ b/src/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java
@@ -28,7 +28,6 @@ package sun.tools.jconsole.inspector;
// java import
import java.awt.*;
import javax.swing.*;
-import java.io.*;
//
public class ThreadDialog implements Runnable {
diff --git a/src/share/classes/sun/tools/jconsole/inspector/Utils.java b/src/share/classes/sun/tools/jconsole/inspector/Utils.java
index 885af9569fa8d675d47bed2c584306492b6830f0..cc97c4e1fb609dfd9f584862ddca3b7eb49db23f 100644
--- a/src/share/classes/sun/tools/jconsole/inspector/Utils.java
+++ b/src/share/classes/sun/tools/jconsole/inspector/Utils.java
@@ -284,7 +284,7 @@ public class Utils {
*/
public static Object newStringConstructor(String type, String param)
throws Exception {
- Constructor c = Utils.getClass(type).getConstructor(String.class);
+ Constructor> c = Utils.getClass(type).getConstructor(String.class);
try {
return c.newInstance(param);
} catch (InvocationTargetException e) {
diff --git a/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java b/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java
index 8f4abfc7ad2c71d6ba75a48ba7adac16ad51f272..b42d5c6702243b81c77c24c753e9ad4552a54818 100644
--- a/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java
+++ b/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java
@@ -46,9 +46,9 @@ class XArrayDataViewer {
if (isViewableValue(value)) {
Object[] arr;
if (value instanceof Collection) {
- arr = ((Collection) value).toArray();
+ arr = ((Collection>) value).toArray();
} else if (value instanceof Map) {
- arr = ((Map) value).entrySet().toArray();
+ arr = ((Map,?>) value).entrySet().toArray();
} else if (value instanceof Object[]) {
arr = (Object[]) value;
} else {
diff --git a/src/share/classes/sun/tools/jconsole/inspector/XDataViewer.java b/src/share/classes/sun/tools/jconsole/inspector/XDataViewer.java
index 0742748abc76aabd64af5476e710abd8ac118010..c820d83196637f6e01a61936297d0315f22e4d4b 100644
--- a/src/share/classes/sun/tools/jconsole/inspector/XDataViewer.java
+++ b/src/share/classes/sun/tools/jconsole/inspector/XDataViewer.java
@@ -34,7 +34,7 @@ import java.awt.Component;
import java.awt.Container;
import sun.tools.jconsole.MBeansTab;
-import sun.tools.jconsole.Resources;
+import sun.tools.jconsole.Messages;
public class XDataViewer {
@@ -100,10 +100,10 @@ public class XDataViewer {
public static String getActionLabel(int type) {
if(type == ARRAY ||
type == OPEN)
- return Resources.getText("visualize");
+ return Messages.VISUALIZE;
if(type == NUMERIC)
- return Resources.getText("plot");
- return Resources.getText("expand");
+ return Messages.PLOT;
+ return Messages.EXPAND;
}
public Component createOperationViewer(Object value,
diff --git a/src/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java b/src/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java
index 0fe157f9648992b3a5f23fe9b670896ef575d115..474b928010fbdc411f9b236219fd9f62d77bfc28 100644
--- a/src/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java
+++ b/src/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java
@@ -66,9 +66,9 @@ import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;
-import sun.tools.jconsole.Resources;
import sun.tools.jconsole.MBeansTab;
import sun.tools.jconsole.JConsole;
+import sun.tools.jconsole.Messages;
import sun.tools.jconsole.ProxyClient.SnapshotMBeanServerConnection;
/*IMPORTANT :
@@ -84,8 +84,8 @@ public class XMBeanAttributes extends XTable {
Logger.getLogger(XMBeanAttributes.class.getPackage().getName());
private final static String[] columnNames =
- {Resources.getText("Name"),
- Resources.getText("Value")};
+ {Messages.NAME,
+ Messages.VALUE};
private XMBean mbean;
private MBeanInfo mbeanInfo;
@@ -267,7 +267,7 @@ public class XMBeanAttributes extends XTable {
public boolean isColumnEditable(int column) {
if (column < getColumnCount()) {
- return getColumnName(column).equals(Resources.getText("Value"));
+ return getColumnName(column).equals(Messages.VALUE);
}
else {
return false;
@@ -313,7 +313,7 @@ public class XMBeanAttributes extends XTable {
if (value != null) {
tip = value.toString();
if(isAttributeViewable(row, VALUE_COLUMN))
- tip = Resources.getText("Double click to expand/collapse")+
+ tip = Messages.DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE+
". " + tip;
}
@@ -589,7 +589,7 @@ public class XMBeanAttributes extends XTable {
comp,
rowMinHeight);
- mbeansTab.getDataViewer().registerForMouseEvent(
+ XDataViewer.registerForMouseEvent(
comp, mouseListener);
} else
return cell;
@@ -724,7 +724,7 @@ public class XMBeanAttributes extends XTable {
mbeansTab.getDataViewer().createAttributeViewer(
value, mbean, attribute, XMBeanAttributes.this);
cell.init(cell.getMinRenderer(), comp, cell.getMinHeight());
- mbeansTab.getDataViewer().registerForMouseEvent(comp, mouseListener);
+ XDataViewer.registerForMouseEvent(comp, mouseListener);
}
} else {
cell = new ZoomedCell(value);
@@ -735,7 +735,7 @@ public class XMBeanAttributes extends XTable {
}
}
- //will be called in a synchronzed block
+ //will be called in a synchronized block
protected void addTableData(DefaultTableModel tableModel,
XMBean mbean,
MBeanAttributeInfo[] attributesInfo,
@@ -749,7 +749,7 @@ public class XMBeanAttributes extends XTable {
for (int i = 0; i < attributesInfo.length; i++) {
rowData[0] = (attributesInfo[i].getName());
if (unavailableAttributes.containsKey(rowData[0])) {
- rowData[1] = Resources.getText("Unavailable");
+ rowData[1] = Messages.UNAVAILABLE;
} else if (viewableAttributes.containsKey(rowData[0])) {
rowData[1] = viewableAttributes.get(rowData[0]);
if (!attributesInfo[i].isWritable() ||
@@ -811,7 +811,6 @@ public class XMBeanAttributes extends XTable {
}
}
- @SuppressWarnings("serial")
class ValueCellEditor extends XTextFieldEditor {
// implements javax.swing.table.TableCellEditor
@Override
@@ -866,7 +865,6 @@ public class XMBeanAttributes extends XTable {
}
}
- @SuppressWarnings("serial")
class MaximizedCellRenderer extends DefaultTableCellRenderer {
Component comp;
MaximizedCellRenderer(Component comp) {
@@ -1018,7 +1016,7 @@ public class XMBeanAttributes extends XTable {
(String)tableValue);// value
} catch (Throwable ex) {
popupAndLog(ex,"tableChanged",
- "Problem setting attribute");
+ Messages.PROBLEM_SETTING_ATTRIBUTE);
}
}
final String attributeName = getValueName(e.getFirstRow());
@@ -1042,7 +1040,7 @@ public class XMBeanAttributes extends XTable {
}
mbean.setAttribute(attribute);
} catch (Throwable ex) {
- popupAndLog(ex,method,"Problem setting attribute");
+ popupAndLog(ex,method,Messages.PROBLEM_SETTING_ATTRIBUTE);
}
return null;
}
@@ -1062,7 +1060,7 @@ public class XMBeanAttributes extends XTable {
}
// Call this outside EDT
- private void popupAndLog(Throwable ex, String method, String key) {
+ private void popupAndLog(Throwable ex, String method, String title) {
ex = Utils.getActualException(ex);
if (JConsole.isDebug()) ex.printStackTrace();
@@ -1070,7 +1068,7 @@ public class XMBeanAttributes extends XTable {
: ex.toString();
EventQueue.invokeLater(
new ThreadDialog(component, message+"\n",
- Resources.getText(key),
+ title,
JOptionPane.ERROR_MESSAGE));
}
}
diff --git a/src/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java b/src/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java
index c98c4821909cffcd60d1fa09eee73ea14f056f86..cac986ad162a5581dc63a116a79658c4a8f27cdc 100644
--- a/src/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java
+++ b/src/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java
@@ -35,7 +35,8 @@ import javax.swing.*;
import javax.swing.border.TitledBorder;
import javax.swing.event.*;
import javax.swing.table.*;
-import sun.tools.jconsole.Resources;
+
+import sun.tools.jconsole.Messages;
import static sun.tools.jconsole.Utilities.*;
@@ -43,11 +44,11 @@ import static sun.tools.jconsole.Utilities.*;
public class XMBeanInfo extends JPanel {
private static final Color lightYellow = new Color(255, 255, 128);
- private final int NAME_COLUMN = 0;
+ private final int NAME_COLUMN = 0;
private final int VALUE_COLUMN = 1;
private final String[] columnNames = {
- Resources.getText("Name"),
- Resources.getText("Value")
+ Messages.NAME,
+ Messages.VALUE
};
private JTable infoTable = new JTable();
private JTable descTable = new JTable();
@@ -163,7 +164,7 @@ public class XMBeanInfo extends JPanel {
descTable.setAutoResizeMode(JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS);
JScrollPane descTableScrollPane = new JScrollPane(descTable);
descBorderPanel.setBorder(
- BorderFactory.createTitledBorder(Resources.getText("Descriptor")));
+ BorderFactory.createTitledBorder(Messages.DESCRIPTOR));
descBorderPanel.add(descTableScrollPane);
// Add the two tables to the grid
//
@@ -230,20 +231,20 @@ public class XMBeanInfo extends JPanel {
emptyInfoTable();
emptyDescTable();
((TitledBorder) infoBorderPanel.getBorder()).setTitle(
- Resources.getText("MBeanInfo"));
- String text = Resources.getText("Info") + ":";
+ Messages.MBEAN_INFO);
+ String text = Messages.INFO + ":";
DefaultTableModel tableModel = (DefaultTableModel) infoTable.getModel();
Object rowData[] = new Object[2];
rowData[0] = new TableRowDivider(text);
rowData[1] = new TableRowDivider("");
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("ObjectName");
+ rowData[0] = Messages.OBJECT_NAME;
rowData[1] = mbean.getObjectName();
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("ClassName");
+ rowData[0] = Messages.CLASS_NAME;
rowData[1] = mbeanInfo.getClassName();
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Description");
+ rowData[0] = Messages.DESCRIPTION;
rowData[1] = mbeanInfo.getDescription();
tableModel.addRow(rowData);
addDescriptor(mbeanInfo.getDescriptor(), text);
@@ -252,13 +253,13 @@ public class XMBeanInfo extends JPanel {
int i = 0;
for (MBeanConstructorInfo mbci : mbeanInfo.getConstructors()) {
addMBeanConstructorInfo(mbci,
- Resources.getText("Constructor") + "-" + i + ":");
+ Messages.CONSTRUCTOR + "-" + i + ":");
// MBeanParameterInfo
//
int j = 0;
for (MBeanParameterInfo mbpi : mbci.getSignature()) {
addMBeanParameterInfo(mbpi,
- Resources.getText("Parameter") + "-" + i + "-" + j + ":");
+ Messages.PARAMETER + "-" + i + "-" + j + ":");
j++;
}
i++;
@@ -271,29 +272,29 @@ public class XMBeanInfo extends JPanel {
emptyInfoTable();
emptyDescTable();
((TitledBorder) infoBorderPanel.getBorder()).setTitle(
- Resources.getText("MBeanAttributeInfo"));
- String text = Resources.getText("Attribute") + ":";
+ Messages.MBEAN_ATTRIBUTE_INFO);
+ String text = Messages.ATTRIBUTE + ":";
DefaultTableModel tableModel = (DefaultTableModel) infoTable.getModel();
Object rowData[] = new Object[2];
rowData[0] = new TableRowDivider(text);
rowData[1] = new TableRowDivider("");
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Name");
+ rowData[0] = Messages.NAME;
rowData[1] = mbai.getName();
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Description");
+ rowData[0] = Messages.DESCRIPTION;
rowData[1] = mbai.getDescription();
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Readable");
+ rowData[0] = Messages.READABLE;
rowData[1] = mbai.isReadable();
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Writable");
+ rowData[0] = Messages.WRITABLE;
rowData[1] = mbai.isWritable();
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Is");
+ rowData[0] = Messages.IS;
rowData[1] = mbai.isIs();
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Type");
+ rowData[0] = Messages.TYPE;
rowData[1] = mbai.getType();
tableModel.addRow(rowData);
addDescriptor(mbai.getDescriptor(), text);
@@ -305,36 +306,36 @@ public class XMBeanInfo extends JPanel {
emptyInfoTable();
emptyDescTable();
((TitledBorder) infoBorderPanel.getBorder()).setTitle(
- Resources.getText("MBeanOperationInfo"));
- String text = Resources.getText("Operation") + ":";
+ Messages.MBEAN_OPERATION_INFO);
+ String text = Messages.OPERATION + ":";
DefaultTableModel tableModel = (DefaultTableModel) infoTable.getModel();
Object rowData[] = new Object[2];
rowData[0] = new TableRowDivider(text);
rowData[1] = new TableRowDivider("");
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Name");
+ rowData[0] = Messages.NAME;
rowData[1] = mboi.getName();
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Description");
+ rowData[0] = Messages.DESCRIPTION;
rowData[1] = mboi.getDescription();
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Impact");
+ rowData[0] = Messages.IMPACT;
switch (mboi.getImpact()) {
case MBeanOperationInfo.INFO:
- rowData[1] = Resources.getText("INFO");
+ rowData[1] = Messages.INFO_CAPITALIZED;
break;
case MBeanOperationInfo.ACTION:
- rowData[1] = Resources.getText("ACTION");
+ rowData[1] = Messages.ACTION_CAPITALIZED;
break;
case MBeanOperationInfo.ACTION_INFO:
- rowData[1] = Resources.getText("ACTION_INFO");
+ rowData[1] = Messages.ACTION_INFO_CAPITALIZED;
break;
case MBeanOperationInfo.UNKNOWN:
- rowData[1] = Resources.getText("UNKNOWN");
+ rowData[1] = Messages.UNKNOWN_CAPITALIZED;
break;
}
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("ReturnType");
+ rowData[0] = Messages.RETURN_TYPE;
rowData[1] = mboi.getReturnType();
tableModel.addRow(rowData);
addDescriptor(mboi.getDescriptor(), text);
@@ -343,7 +344,7 @@ public class XMBeanInfo extends JPanel {
int i = 0;
for (MBeanParameterInfo mbpi : mboi.getSignature()) {
addMBeanParameterInfo(mbpi,
- Resources.getText("Parameter") + "-" + i++ + ":");
+ Messages.PARAMETER + "-" + i++ + ":");
}
tableModel.newDataAvailable(new TableModelEvent(tableModel));
}
@@ -353,20 +354,20 @@ public class XMBeanInfo extends JPanel {
emptyInfoTable();
emptyDescTable();
((TitledBorder) infoBorderPanel.getBorder()).setTitle(
- Resources.getText("MBeanNotificationInfo"));
- String text = Resources.getText("Notification") + ":";
+ Messages.MBEAN_NOTIFICATION_INFO);
+ String text = Messages.NOTIFICATION + ":";
DefaultTableModel tableModel = (DefaultTableModel) infoTable.getModel();
Object rowData[] = new Object[2];
rowData[0] = new TableRowDivider(text);
rowData[1] = new TableRowDivider("");
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Name");
+ rowData[0] = Messages.NAME;
rowData[1] = mbni.getName();
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Description");
+ rowData[0] = Messages.DESCRIPTION;
rowData[1] = mbni.getDescription();
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("NotifTypes");
+ rowData[0] = Messages.NOTIF_TYPES;
rowData[1] = Arrays.toString(mbni.getNotifTypes());
tableModel.addRow(rowData);
addDescriptor(mbni.getDescriptor(), text);
@@ -380,10 +381,10 @@ public class XMBeanInfo extends JPanel {
rowData[0] = new TableRowDivider(text);
rowData[1] = new TableRowDivider("");
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Name");
+ rowData[0] = Messages.NAME;
rowData[1] = mbci.getName();
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Description");
+ rowData[0] = Messages.DESCRIPTION;
rowData[1] = mbci.getDescription();
tableModel.addRow(rowData);
addDescriptor(mbci.getDescriptor(), text);
@@ -397,13 +398,13 @@ public class XMBeanInfo extends JPanel {
rowData[0] = new TableRowDivider(text);
rowData[1] = new TableRowDivider("");
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Name");
+ rowData[0] = Messages.NAME;
rowData[1] = mbpi.getName();
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Description");
+ rowData[0] = Messages.DESCRIPTION;
rowData[1] = mbpi.getDescription();
tableModel.addRow(rowData);
- rowData[0] = Resources.getText("Type");
+ rowData[0] = Messages.TYPE;
rowData[1] = mbpi.getType();
tableModel.addRow(rowData);
addDescriptor(mbpi.getDescriptor(), text);
diff --git a/src/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java b/src/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java
index 2d11b8a6be46bea4279eb97d9a7b596b26acace4..5077797bdacb89bbae964ae00b12c89a2c026453 100644
--- a/src/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java
+++ b/src/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java
@@ -26,7 +26,6 @@
package sun.tools.jconsole.inspector;
import javax.swing.*;
-import javax.swing.event.*;
import javax.swing.table.*;
import javax.swing.tree.*;
import java.awt.Font;
@@ -46,19 +45,19 @@ import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
import sun.tools.jconsole.JConsole;
-import sun.tools.jconsole.Resources;
+import sun.tools.jconsole.Messages;
@SuppressWarnings("serial")
public class XMBeanNotifications extends JTable implements NotificationListener {
private final static String[] columnNames = {
- Resources.getText("TimeStamp"),
- Resources.getText("Type"),
- Resources.getText("UserData"),
- Resources.getText("SeqNum"),
- Resources.getText("Message"),
- Resources.getText("Event"),
- Resources.getText("Source")
+ Messages.TIME_STAMP,
+ Messages.TYPE,
+ Messages.USER_DATA,
+ Messages.SEQ_NUM,
+ Messages.MESSAGE,
+ Messages.EVENT,
+ Messages.SOURCE
};
private HashMap listeners =
new HashMap();
@@ -183,7 +182,7 @@ public class XMBeanNotifications extends JTable implements NotificationListener
}
if (cell != null) {
- toolTip = Resources.getText("Double click to expand/collapse") +
+ toolTip = Messages.DOUBLE_CLICK_TO_EXPAND_FORWARD_SLASH_COLLAPSE+
". " + cell.toString();
} else {
Object val =
@@ -599,7 +598,6 @@ public class XMBeanNotifications extends JTable implements NotificationListener
class XMBeanNotificationsListener implements NotificationListener {
- private String[] columnNames;
private XMBean xmbean;
private DefaultMutableTreeNode node;
private volatile long received;
@@ -615,7 +613,6 @@ public class XMBeanNotifications extends JTable implements NotificationListener
this.notifications = notifications;
this.xmbean = xmbean;
this.node = node;
- this.columnNames = columnNames;
register(node);
}
diff --git a/src/share/classes/sun/tools/jconsole/inspector/XObject.java b/src/share/classes/sun/tools/jconsole/inspector/XObject.java
index 9e562863eee3a499f7440e5f6f77759d09f47247..303090abacbd9abcc99e10b70797cd03f05dfe27 100644
--- a/src/share/classes/sun/tools/jconsole/inspector/XObject.java
+++ b/src/share/classes/sun/tools/jconsole/inspector/XObject.java
@@ -28,17 +28,6 @@ package sun.tools.jconsole.inspector;
// java import
import javax.swing.*;
-//
-
-// java import
-import java.io.*;
-import java.awt.*;
-import java.awt.dnd.*;
-import java.awt.datatransfer.*;
-import java.net.*;
-//
-
-
/**
* This provides a wrapper to the Object class to allow it to be
displayed/manipulated as a GUI object.
diff --git a/src/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java b/src/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java
index fb4ddf16cbe9a3c39d440aa272965ab853b6db14..108ff7a2181d1d505c1da9f81a46c9371b753eaa 100644
--- a/src/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java
+++ b/src/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java
@@ -28,33 +28,21 @@ package sun.tools.jconsole.inspector;
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.table.*;
-import javax.swing.tree.*;
-import javax.swing.border.*;
import java.awt.BorderLayout;
-import java.awt.GridLayout;
import java.awt.FlowLayout;
import java.awt.Component;
-import java.awt.EventQueue;
import java.awt.Color;
import java.awt.Font;
-import java.awt.Rectangle;
import java.awt.event.*;
-import java.awt.Insets;
import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
import java.util.*;
-import java.io.*;
import java.lang.reflect.Array;
-import javax.management.*;
import javax.management.openmbean.*;
-import sun.tools.jconsole.BorderedComponent;
import sun.tools.jconsole.JConsole;
-import sun.tools.jconsole.LabeledComponent;
+import sun.tools.jconsole.Messages;
import sun.tools.jconsole.Resources;
-import sun.tools.jconsole.VariableGridLayout;
@SuppressWarnings("serial")
public class XOpenTypeViewer extends JPanel implements ActionListener {
@@ -65,9 +53,9 @@ public class XOpenTypeViewer extends JPanel implements ActionListener {
XOpenTypeDataListener listener = new XOpenTypeDataListener();
private static final String compositeNavigationSingle =
- Resources.getText("MBeansTab.compositeNavigationSingle");
+ Messages.MBEANS_TAB_COMPOSITE_NAVIGATION_SINGLE;
private static final String tabularNavigationSingle =
- Resources.getText("MBeansTab.tabularNavigationSingle");
+ Messages.MBEANS_TAB_TABULAR_NAVIGATION_SINGLE;
private static TableCellEditor editor =
new Utils.ReadOnlyTableCellEditor(new JTextField());
@@ -121,7 +109,6 @@ public class XOpenTypeViewer extends JPanel implements ActionListener {
static abstract class XOpenTypeData extends JTable {
XOpenTypeData parent;
- private Color defaultColor;
protected int col1Width = -1;
protected int col2Width = -1;
private boolean init;
@@ -139,7 +126,7 @@ public class XOpenTypeViewer extends JPanel implements ActionListener {
Object value = getModel().getValueAt(row, col);
if (value != null) {
if(isClickableElement(value))
- return Resources.getText("Double click to visualize")
+ return Messages.DOUBLE_CLICK_TO_VISUALIZE
+ ". " + value.toString();
else
return value.toString();
@@ -265,7 +252,7 @@ public class XOpenTypeViewer extends JPanel implements ActionListener {
Object c1 = o1.get(key);
Object c2 = o2.get(key);
if (c1 instanceof Comparable && c2 instanceof Comparable) {
- int result = ((Comparable) c1).compareTo(c2);
+ int result = ((Comparable | | |