X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FViewSelectionMenu.java;h=26c52c991b5a303c321c66e28d85979118aa45c9;hb=e33b171845992fd21094ba754498f9ab3d29f110;hp=5cad55db4cdb161fa57adb6a5253c84997b4cce4;hpb=24f64bdbc24848b66d96e9a30f72ee92e8633a3d;p=jalview.git
diff --git a/src/jalview/gui/ViewSelectionMenu.java b/src/jalview/gui/ViewSelectionMenu.java
index 5cad55d..26c52c9 100644
--- a/src/jalview/gui/ViewSelectionMenu.java
+++ b/src/jalview/gui/ViewSelectionMenu.java
@@ -1,3 +1,20 @@
+/*******************************************************************************
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ *
+ * 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 .
+ *******************************************************************************/
package jalview.gui;
import java.awt.Component;
@@ -20,25 +37,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 _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 +82,84 @@ 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 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("When enabled, allows many views to be selected.");
+ 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("Select all views"));
+ selectAll.addActionListener(new ActionListener()
{
@Override
@@ -111,40 +167,47 @@ 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("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 +215,43 @@ public class ViewSelectionMenu extends JMenu
@Override
public void itemStateChanged(ItemEvent e)
{
- if (e.getStateChange() == e.SELECTED)
+ if (enabled)
{
- _selectedviews.add(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
{
- _selectedviews.remove(p);
+ // 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()