X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FViewSelectionMenu.java;h=ed9f013622bd90560896f3ec6912639356b499b6;hb=9811278f9e18ee6cb88470dbae98da046734a0af;hp=b3ac40560ae68e8012cc570627ee8e3468931411;hpb=e0edfabf5128547419e2fd192e98c74fd0f81faa;p=jalview.git
diff --git a/src/jalview/gui/ViewSelectionMenu.java b/src/jalview/gui/ViewSelectionMenu.java
index b3ac405..ed9f013 100644
--- a/src/jalview/gui/ViewSelectionMenu.java
+++ b/src/jalview/gui/ViewSelectionMenu.java
@@ -1,12 +1,35 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.gui;
+import jalview.api.AlignmentViewPanel;
+import jalview.util.MessageManager;
+
import java.awt.Component;
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;
@@ -20,6 +43,8 @@ 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
*
*/
@@ -27,24 +52,15 @@ public class ViewSelectionMenu extends JMenu
{
public interface ViewSetProvider
{
- public AlignmentPanel[] getAllAlignmentPanels();
+ public AlignmentViewPanel[] getAllAlignmentPanels();
}
private ViewSetProvider _allviews;
- private List _selectedviews;
+ private List _selectedviews;
private ItemListener _handler;
- @Override
- protected void finalize() throws Throwable
- {
- _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
@@ -64,7 +80,7 @@ public class ViewSelectionMenu extends JMenu
* selection/deselection state
*/
public ViewSelectionMenu(String title, final ViewSetProvider allviews,
- final List selectedviews,
+ final List selectedviews,
final ItemListener handler)
{
super(title);
@@ -102,16 +118,21 @@ public class ViewSelectionMenu extends JMenu
* menu selection event occurred.
*/
private boolean append = false;
+
/**
- * flag indicating if the itemStateChanged listener for view associated menu items is currently enabled
+ * 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 JCheckBoxMenuItem toggleview = null;
+
private void rebuild()
{
removeAll();
- AlignmentPanel[] allviews = _allviews.getAllAlignmentPanels();
+ AlignmentViewPanel[] allviews = _allviews.getAllAlignmentPanels();
if (allviews == null)
{
setVisible(false);
@@ -119,10 +140,14 @@ public class ViewSelectionMenu extends JMenu
}
if (allviews.length >= 2)
{
-
- toggleview = new JCheckBoxMenuItem("Select many views",append);
- toggleview.setToolTipText("When selected, toggles whether a particular view is used to colour the alignment.");
- toggleview.addItemListener(new ItemListener() {
+ // ensure we update menu state to reflect external selection list state
+ append = append || _selectedviews.size() > 1;
+ toggleview = new JCheckBoxMenuItem(
+ MessageManager.getString("label.select_many_views"), append);
+ toggleview.setToolTipText(
+ MessageManager.getString("label.toggle_enabled_views"));
+ toggleview.addItemListener(new ItemListener()
+ {
@Override
public void itemStateChanged(ItemEvent arg0)
@@ -133,12 +158,13 @@ public class ViewSelectionMenu extends JMenu
selectAll.setEnabled(append);
invertSel.setEnabled(append);
}
-
+
}
-
+
});
add(toggleview);
- add(selectAll= new JMenuItem("Select all views"));
+ add(selectAll = new JMenuItem(
+ MessageManager.getString("label.select_all_views")));
selectAll.addActionListener(new ActionListener()
{
@@ -147,136 +173,119 @@ public class ViewSelectionMenu extends JMenu
{
for (Component c : getMenuComponents())
{
- boolean t=append;
- append=true;
+ boolean t = append;
+ append = true;
if (c instanceof JCheckBoxMenuItem)
{
- if (toggleview!=c && !((JCheckBoxMenuItem) c).isSelected())
+ if (toggleview != c && !((JCheckBoxMenuItem) c).isSelected())
{
((JCheckBoxMenuItem) c).doClick();
}
}
- append=t;
+ append = t;
}
}
});
- add(invertSel = new JMenuItem("Invert selection"));
+ add(invertSel = new JMenuItem(
+ MessageManager.getString("label.invert_selection")));
invertSel.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- boolean t=append;
- append=true;
+ boolean t = append;
+ append = true;
for (Component c : getMenuComponents())
{
- if (toggleview!=c && c instanceof JCheckBoxMenuItem)
+ if (toggleview != c && c instanceof JCheckBoxMenuItem)
{
((JCheckBoxMenuItem) c).doClick();
}
}
- append=t;
+ append = t;
}
});
invertSel.setEnabled(append);
selectAll.setEnabled(append);
}
- for (AlignmentPanel ap : allviews)
+ for (final AlignmentViewPanel ap : allviews)
{
- String nm = ((ap.getViewName() == null || ap.getViewName().length() == 0) ? ""
- : ap.getViewName() + " for ")
- + ap.alignFrame.getTitle();
- final JCheckBoxMenuItem a = new JCheckBoxMenuItem(nm,
+ String nm = ((ap.getViewName() == null
+ || ap.getViewName().length() == 0) ? ""
+ : ap.getViewName() + " for ")
+ + ap.getTitle();
+ 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)
{
if (enabled)
{
- if (append)
- {
- if (e.getStateChange() == e.SELECTED)
+ if (append)
{
- _selectedviews.add(p);
+ enabled = false;
+ // toggle the inclusion state
+ if (_selectedviews.indexOf(ap) == -1)
+ {
+ _selectedviews.add(ap);
+ checkBox.setSelected(true);
+ }
+ else
+ {
+ _selectedviews.remove(ap);
+ checkBox.setSelected(false);
+ }
+ enabled = true;
+ _handler.itemStateChanged(e);
}
else
{
- _selectedviews.remove(p);
- }
- _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)
+ // Deselect everything and select this item only
+ _selectedviews.clear();
+ _selectedviews.add(ap);
+ enabled = false;
+ for (Component c : getMenuComponents())
{
- ((JCheckBoxMenuItem) c).setSelected(a == c);
+ if (c instanceof JCheckBoxMenuItem)
+ {
+ ((JCheckBoxMenuItem) c).setSelected(checkBox == c);
+ }
}
+ enabled = true;
+ // only fire event if we weren't selected before
+ _handler.itemStateChanged(e);
}
- enabled=true;
- // only fire event if we weren't selected before
- _handler.itemStateChanged(e);
- }
}
}
});
- 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);
}
}