JAL-1620 version bump and release notes
[jalview.git] / src / jalview / gui / ViewSelectionMenu.java
index 5cad55d..bfef2be 100644 (file)
@@ -1,5 +1,27 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * Copyright (C) 2014 The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview 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 for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
+import jalview.util.MessageManager;
+
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -20,25 +42,33 @@ import javax.swing.event.MenuListener;
  * dialog/menu which allows the user to select/deselect specific views from a
  * list of associated views.
  * 
+ * Includes patches related to JAL-641
+ * 
  * @author JimP
  * 
  */
 public class ViewSelectionMenu extends JMenu
 {
-  public interface ViewSetProvider {
+  public interface ViewSetProvider
+  {
     public AlignmentPanel[] getAllAlignmentPanels();
   }
+
   private ViewSetProvider _allviews;
+
   private List<AlignmentPanel> _selectedviews;
+
   private ItemListener _handler;
+
   @Override
   protected void finalize() throws Throwable
   {
-    _selectedviews=null;
-    _handler=null;
-    _allviews=null;
+    _selectedviews = null;
+    _handler = null;
+    _allviews = null;
     super.finalize();
   }
+
   /**
    * create a new view selection menu. This menu has some standard entries
    * (select all, invert selection), and a checkbox for every view. Mousing over
@@ -57,53 +87,92 @@ public class ViewSelectionMenu extends JMenu
    *          update any gui elements which need to reflect current
    *          selection/deselection state
    */
-  public ViewSelectionMenu(String title,
-          final ViewSetProvider allviews,
+  public ViewSelectionMenu(String title, final ViewSetProvider allviews,
           final List<AlignmentPanel> selectedviews,
           final ItemListener handler)
   {
     super(title);
     this._allviews = allviews;
     this._selectedviews = selectedviews;
-    this._handler=handler;
+    this._handler = handler;
     addMenuListener(new MenuListener()
     {
-      
+
       @Override
       public void menuSelected(MenuEvent e)
       {
         rebuild();
-        
+
       }
-      
+
       @Override
       public void menuDeselected(MenuEvent e)
       {
         // TODO Auto-generated method stub
-        
+
       }
-      
+
       @Override
       public void menuCanceled(MenuEvent e)
       {
         // TODO Auto-generated method stub
-        
+
       }
     });
   }
-  private void rebuild() {
+
+  /**
+   * view selection modifier flag - indicates if an action key is pressed when
+   * menu selection event occurred.
+   */
+  private boolean append = false;
+
+  /**
+   * flag indicating if the itemStateChanged listener for view associated menu
+   * items is currently enabled
+   */
+  private boolean enabled = true;
+
+  private JMenuItem selectAll, invertSel;
+
+  private JCheckBoxMenuItem toggleview = null;
+
+  private void rebuild()
+  {
     removeAll();
-    AlignmentPanel[] allviews=_allviews.getAllAlignmentPanels();
-    if (allviews==null)
+    AlignmentPanel[] allviews = _allviews.getAllAlignmentPanels();
+    if (allviews == null)
     {
       setVisible(false);
       return;
     }
     if (allviews.length >= 2)
     {
-      JMenuItem item;
-      add(item = new JMenuItem("Select all views"));
-      item.addActionListener(new ActionListener()
+      // 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.addItemListener(new ItemListener()
+      {
+
+        @Override
+        public void itemStateChanged(ItemEvent arg0)
+        {
+          if (enabled)
+          {
+            append = !append;
+            selectAll.setEnabled(append);
+            invertSel.setEnabled(append);
+          }
+
+        }
+
+      });
+      add(toggleview);
+      add(selectAll = new JMenuItem(
+              MessageManager.getString("label.select_all_views")));
+      selectAll.addActionListener(new ActionListener()
       {
 
         @Override
@@ -111,40 +180,48 @@ public class ViewSelectionMenu extends JMenu
         {
           for (Component c : getMenuComponents())
           {
+            boolean t = append;
+            append = true;
             if (c instanceof JCheckBoxMenuItem)
             {
-              if (!((JCheckBoxMenuItem) c).isSelected())
+              if (toggleview != c && !((JCheckBoxMenuItem) c).isSelected())
               {
                 ((JCheckBoxMenuItem) c).doClick();
               }
             }
+            append = t;
           }
         }
       });
-      add(item = new JMenuItem("Invert selection"));
-      item.addActionListener(new ActionListener()
+      add(invertSel = new JMenuItem(
+              MessageManager.getString("label.invert_selection")));
+      invertSel.addActionListener(new ActionListener()
       {
 
         @Override
         public void actionPerformed(ActionEvent e)
         {
+          boolean t = append;
+          append = true;
           for (Component c : getMenuComponents())
           {
-            if (c instanceof JCheckBoxMenuItem)
+            if (toggleview != c && c instanceof JCheckBoxMenuItem)
             {
               ((JCheckBoxMenuItem) c).doClick();
             }
           }
+          append = t;
         }
       });
-
+      invertSel.setEnabled(append);
+      selectAll.setEnabled(append);
     }
     for (AlignmentPanel ap : allviews)
     {
       String nm = ((ap.getViewName() == null || ap.getViewName().length() == 0) ? ""
               : ap.getViewName() + " for ")
               + ap.alignFrame.getTitle();
-      JCheckBoxMenuItem a = new JCheckBoxMenuItem(nm,
+      final JCheckBoxMenuItem a = new JCheckBoxMenuItem(nm,
               _selectedviews.contains(ap));
       final AlignmentPanel p = ap;
       a.addItemListener(new ItemListener()
@@ -152,15 +229,43 @@ public class ViewSelectionMenu extends JMenu
         @Override
         public void itemStateChanged(ItemEvent e)
         {
-          if (e.getStateChange() == e.SELECTED)
-          {
-            _selectedviews.add(p);
-          }
-          else
+          if (enabled)
           {
-            _selectedviews.remove(p);
+            if (append)
+            {
+              enabled = false;
+              // toggle the inclusion state
+              if (_selectedviews.indexOf(p) == -1)
+              {
+                _selectedviews.add(p);
+                a.setSelected(true);
+              }
+              else
+              {
+                _selectedviews.remove(p);
+                a.setSelected(false);
+              }
+              enabled = true;
+              _handler.itemStateChanged(e);
+            }
+            else
+            {
+              // Deselect everything and select this item only
+              _selectedviews.clear();
+              _selectedviews.add(p);
+              enabled = false;
+              for (Component c : getMenuComponents())
+              {
+                if (c instanceof JCheckBoxMenuItem)
+                {
+                  ((JCheckBoxMenuItem) c).setSelected(a == c);
+                }
+              }
+              enabled = true;
+              // only fire event if we weren't selected before
+              _handler.itemStateChanged(e);
+            }
           }
-          _handler.itemStateChanged(e);
         }
       });
       a.addMouseListener(new MouseListener()