JAL-2738 copy to spikes/mungo

[jalview.git] / src / jalview / gui / ViewSelectionMenu.java

diff --git a/src/jalview/gui/ViewSelectionMenu.java b/src/jalview/gui/ViewSelectionMenu.java
index 5a16e2e..cdbb4fa 100644 (file)
--- a/src/jalview/gui/ViewSelectionMenu.java
+++ b/src/jalview/gui/ViewSelectionMenu.java
@@ -27,8 +27,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 import java.util.List;
 
 import javax.swing.JCheckBoxMenuItem;
@@ -150,9 +150,10 @@ public class ViewSelectionMenu extends JMenu
     {
       // ensure we update menu state to reflect external selection list state
       append = append || _selectedviews.size() > 1;
-      toggleview = new JCheckBoxMenuItem("Select many views", append);
-      toggleview.setToolTipText(MessageManager
-              .getString("label.toggle_enabled_views"));
+      toggleview = new JCheckBoxMenuItem(
+              MessageManager.getString("label.select_many_views"), append);
+      toggleview.setToolTipText(
+              MessageManager.getString("label.toggle_enabled_views"));
       toggleview.addItemListener(new ItemListener()
       {
 
@@ -216,15 +217,15 @@ public class ViewSelectionMenu extends JMenu
       invertSel.setEnabled(append);
       selectAll.setEnabled(append);
     }
-    for (AlignmentPanel ap : allviews)
+    for (final AlignmentPanel ap : allviews)
     {
-      String nm = ((ap.getViewName() == null || ap.getViewName().length() == 0) ? ""
-              : ap.getViewName() + " for ")
+      String nm = ((ap.getViewName() == null
+              || ap.getViewName().length() == 0) ? ""
+                      : ap.getViewName() + " for ")
               + ap.alignFrame.getTitle();
-      final JCheckBoxMenuItem a = new JCheckBoxMenuItem(nm,
+      final JCheckBoxMenuItem checkBox = new JCheckBoxMenuItem(nm,
               _selectedviews.contains(ap));
-      final AlignmentPanel p = ap;
-      a.addItemListener(new ItemListener()
+      checkBox.addItemListener(new ItemListener()
       {
         @Override
         public void itemStateChanged(ItemEvent e)
@@ -235,15 +236,15 @@ public class ViewSelectionMenu extends JMenu
             {
               enabled = false;
               // toggle the inclusion state
-              if (_selectedviews.indexOf(p) == -1)
+              if (_selectedviews.indexOf(ap) == -1)
               {
-                _selectedviews.add(p);
-                a.setSelected(true);
+                _selectedviews.add(ap);
+                checkBox.setSelected(true);
               }
               else
               {
-                _selectedviews.remove(p);
-                a.setSelected(false);
+                _selectedviews.remove(ap);
+                checkBox.setSelected(false);
               }
               enabled = true;
               _handler.itemStateChanged(e);
@@ -252,13 +253,13 @@ public class ViewSelectionMenu extends JMenu
             {
               // Deselect everything and select this item only
               _selectedviews.clear();
-              _selectedviews.add(p);
+              _selectedviews.add(ap);
               enabled = false;
               for (Component c : getMenuComponents())
               {
                 if (c instanceof JCheckBoxMenuItem)
                 {
-                  ((JCheckBoxMenuItem) c).setSelected(a == c);
+                  ((JCheckBoxMenuItem) c).setSelected(checkBox == c);
                 }
               }
               enabled = true;
@@ -268,54 +269,31 @@ public class ViewSelectionMenu extends JMenu
           }
         }
       });
-      a.addMouseListener(new MouseListener()
+      checkBox.addMouseListener(new MouseAdapter()
       {
-
-        @Override
-        public void mouseReleased(MouseEvent e)
-        {
-          // TODO Auto-generated method stub
-
-        }
-
-        @Override
-        public void mousePressed(MouseEvent e)
-        {
-          // TODO Auto-generated method stub
-
-        }
-
         @Override
         public void mouseExited(MouseEvent e)
         {
           try
           {
-            p.setSelected(false);
+            ap.setSelected(false);
           } catch (Exception ex)
           {
           }
-          ;
         }
 
         @Override
         public void mouseEntered(MouseEvent e)
         {
-
           try
           {
-            p.setSelected(true);
+            ap.setSelected(true);
           } catch (Exception ex)
           {
           }
-          ;
-        }
-
-        @Override
-        public void mouseClicked(MouseEvent e)
-        {
         }
       });
-      add(a);
+      add(checkBox);
     }
   }