X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FViewSelectionMenu.java;h=f77f41054a4d7b6cf57c61c78341e7cf0f75874c;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=e12fb5b92dad299cb4926a2a7fe6be3db6b2b831;hpb=8c6722b27ff92e3610376295e2b4363f942d9969;p=jalview.git

diff --git a/src/jalview/gui/ViewSelectionMenu.java b/src/jalview/gui/ViewSelectionMenu.java
index e12fb5b..f77f410 100644
--- a/src/jalview/gui/ViewSelectionMenu.java
+++ b/src/jalview/gui/ViewSelectionMenu.java
@@ -20,6 +20,10 @@
  */
 package jalview.gui;
 
+import jalview.api.AlignmentViewPanel;
+import jalview.util.MessageManager;
+import jalview.util.Platform;
+
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -35,8 +39,6 @@ import javax.swing.JMenuItem;
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
 
-import jalview.util.MessageManager;
-
 /**
  * this is an implementation of an abstract Jalview GUI class that provides a
  * dialog/menu which allows the user to select/deselect specific views from a
@@ -56,19 +58,10 @@ public class ViewSelectionMenu extends JMenu
 
   private ViewSetProvider _allviews;
 
-  private List<AlignmentPanel> _selectedviews;
+  private List<AlignmentViewPanel> _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
@@ -88,7 +81,7 @@ public class ViewSelectionMenu extends JMenu
    *          selection/deselection state
    */
   public ViewSelectionMenu(String title, final ViewSetProvider allviews,
-          final List<AlignmentPanel> selectedviews,
+          final List<AlignmentViewPanel> selectedviews,
           final ItemListener handler)
   {
     super(title);
@@ -152,8 +145,8 @@ public class ViewSelectionMenu extends JMenu
       append = append || _selectedviews.size() > 1;
       toggleview = new JCheckBoxMenuItem(
               MessageManager.getString("label.select_many_views"), append);
-      toggleview.setToolTipText(MessageManager
-              .getString("label.toggle_enabled_views"));
+      toggleview.setToolTipText(
+              MessageManager.getString("label.toggle_enabled_views"));
       toggleview.addItemListener(new ItemListener()
       {
 
@@ -219,8 +212,9 @@ public class ViewSelectionMenu extends JMenu
     }
     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 checkBox = new JCheckBoxMenuItem(nm,
               _selectedviews.contains(ap));
@@ -268,6 +262,7 @@ public class ViewSelectionMenu extends JMenu
           }
         }
       });
+      final ViewSelectionMenu us = this;
       checkBox.addMouseListener(new MouseAdapter()
       {
         @Override
@@ -275,7 +270,6 @@ public class ViewSelectionMenu extends JMenu
         {
           try
           {
-            ap.setSelected(false);
           } catch (Exception ex)
           {
           }
@@ -286,7 +280,7 @@ public class ViewSelectionMenu extends JMenu
         {
           try
           {
-            ap.setSelected(true);
+            ap.setAlignFrameView();
           } catch (Exception ex)
           {
           }