src/share/classes/sun/tools/jconsole/CreateMBeanDialog.java

rev 5340 : 7017818: NLS: JConsoleResources.java cannot be handled by translation team
Reviewed-by: duke

@@ -30,27 +30,26 @@
 import java.util.List;
 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 sun.tools.jconsole.resources.Messages;
+
 import static sun.tools.jconsole.Utilities.*;
 
 @SuppressWarnings("serial")
 public class CreateMBeanDialog extends InternalDialog
                 implements ActionListener {
     JConsole jConsole;
-    JComboBox connections;
+    JComboBox<ProxyClient> connections;
     JButton createMBeanButton, unregisterMBeanButton, cancelButton;
 
     private static final String HOTSPOT_MBEAN =
         "sun.management.HotspotInternal";
     private static final String HOTSPOT_MBEAN_OBJECTNAME =

@@ -58,40 +57,40 @@
     public CreateMBeanDialog(JConsole jConsole) {
         super(jConsole, "JConsole: Hotspot MBeans", true);
 
         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));
 
         JPanel centerPanel = new JPanel(new VariableGridLayout(0,
                                                         1,
                                                         4,
                                                         4,
                                                         false,
                                                         true));
         cp.add(centerPanel, BorderLayout.CENTER);
-        connections = new JComboBox();
+        connections = new JComboBox<ProxyClient>();
         updateConnections();
 
         centerPanel.add(new LabeledComponent(Resources.
-                                             getText("Manage Hotspot MBeans "+
-                                                     "in: "),
+                                             format(
+                                                     Messages.MANAGE_HOTSPOT_MBEANS_IN_COLON_),
                                              connections));
 
         JPanel bottomPanel = new JPanel(new BorderLayout());
         cp.add(bottomPanel, BorderLayout.SOUTH);
 
         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);
 
         createMBeanButton.addActionListener(this);

@@ -131,22 +130,22 @@
                     data.add(client);
                 }
             }
         }
         connections.invalidate();
-        connections.setModel(new DefaultComboBoxModel(data.toArray()));
+        connections.setModel(new DefaultComboBoxModel<ProxyClient>
+                (data.toArray(new ProxyClient[data.size()])));
         connections.validate();
     }
 
     public void actionPerformed(final ActionEvent ev) {
         setVisible(false);
         statusBar.setText("");
         if (ev.getSource() != cancelButton) {
             new Thread("CreateMBeanDialog.actionPerformed") {
                     public void run() {
                         try {
-                            StringBuffer buff = null;
                             Object c = connections.getSelectedItem();
                             if(c == null) return;
                             if(ev.getSource() == createMBeanButton) {
                                 MBeanServerConnection connection =
                                     ((ProxyClient) c).

@@ -161,17 +160,17 @@
                                         ObjectName(HOTSPOT_MBEAN_OBJECTNAME));
                                 }
                             }
                             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());
                         }
                         setVisible(true);
                     }