Code cleanup

Author: jisedlac

visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/options/HeapViewerOptionsCategory.java

@@ -36,6 +36,7 @@
 import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 import org.openide.util.RequestProcessor;
 
 /**
@@ -47,7 +48,7 @@
         categoryName = "#HeapViewerOptionsCategory_Name", 
         iconBase = "com/sun/tools/visualvm/heapviewer/options/heapViewer32.png",
         position = 1525)
-@org.openide.util.NbBundle.Messages({
+@NbBundle.Messages({
         "HeapViewerOptionsCategory_Name=Heap Viewer"
 }) 
 public final class HeapViewerOptionsCategory extends OptionsPanelController {

visualvm/heapviewer/src/com/sun/tools/visualvm/heapviewer/options/HeapViewerOptionsPanel.java

@@ -185,7 +185,7 @@ private void initComponents() {
 
         setLayout(new GridBagLayout());
 
-        SectionSeparator presetsSection = UISupport.createSectionSeparator("Custom OQL Scripts"); // NOI18N
+        SectionSeparator presetsSection = UISupport.createSectionSeparator("Custom OQL Scripts");
         c = new GridBagConstraints();
         c.gridy = 0;
         c.gridwidth = GridBagConstraints.REMAINDER;
@@ -215,10 +215,10 @@ public void removeSelectionInterval(int i1, int i2) {}
         });
         list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         final Dimension oneDim = new Dimension(1, 1);
-        final JLabel loadingScriptsLabel = new JLabel("<loading scripts>", JLabel.CENTER); // NOI18N
+        final JLabel loadingScriptsLabel = new JLabel("<loading scripts>", JLabel.CENTER);
         loadingScriptsLabel.setEnabled(false);
         loadingScriptsLabel.setSize(loadingScriptsLabel.getPreferredSize());
-        final JLabel noScriptsLabel = new JLabel("<no saved scripts>", JLabel.CENTER); // NOI18N
+        final JLabel noScriptsLabel = new JLabel("<no saved scripts>", JLabel.CENTER);
         noScriptsLabel.setEnabled(false);
         noScriptsLabel.setSize(noScriptsLabel.getPreferredSize());
         JScrollPane listScroll = new JScrollPane(list) {
@@ -253,7 +253,7 @@ protected void fireActionPerformed(ActionEvent e) {
         int mar = nimbusLaF ? 0 : 8;
         margin.left = mar;
         margin.right = mar;
-        removeButton.setToolTipText("Delete selected script"); // NOI18N
+        removeButton.setToolTipText("Delete selected script");
         removeButton.setMargin(margin);
         upButton = new JButton() {
             protected void fireActionPerformed(ActionEvent e) {
@@ -271,7 +271,7 @@ protected void fireActionPerformed(ActionEvent e) {
         };
         downButton.setIcon(new ImageIcon(ImageUtilities.loadImage(
                 "com/sun/tools/visualvm/profiler/resources/down.png", true)));   // NOI18N
-        downButton.setToolTipText("Move selected script down"); // NOI18N
+        downButton.setToolTipText("Move selected script down");
         downButton.setMargin(margin);
 
         JPanel controlsPanel = new JPanel(new GridLayout(1, 4, 5, 0)) {
@@ -306,7 +306,7 @@ public void setEnabled(boolean enabled) {
         add(presetsPanel, c);
 
         JLabel nameLabel = new JLabel();
-        Mnemonics.setLocalizedText(nameLabel, "&Name:"); // NOI18N
+        Mnemonics.setLocalizedText(nameLabel, "&Name:");
         c = new GridBagConstraints();
         c.gridx = 0;
         c.gridy = 0;
@@ -338,7 +338,7 @@ public void setBackground(Color bg) {
         presetsPanel.add(nameField, c);
 
         JLabel descrLabel = new JLabel();
-        Mnemonics.setLocalizedText(descrLabel, "&Description (optional):"); // NOI18N
+        Mnemonics.setLocalizedText(descrLabel, "&Description (optional):");
         c = new GridBagConstraints();
         c.gridx = 0;
         c.gridy = 1;
@@ -378,7 +378,7 @@ public void setEnabled(boolean b) {
         presetsPanel.add(descrScroll, c);
 
         JLabel previewLabel = new JLabel();
-        Mnemonics.setLocalizedText(previewLabel, "&Preview:"); // NOI18N
+        Mnemonics.setLocalizedText(previewLabel, "&Preview:");
         c = new GridBagConstraints();
         c.gridx = 0;
         c.gridy = 3;