JAL-3390 pull-up refactoring towards functional changes...

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

diff --git a/src/jalview/gui/ViewSelectionMenu.java b/src/jalview/gui/ViewSelectionMenu.java
index e12fb5b..ed9f013 100644 (file)
--- a/src/jalview/gui/ViewSelectionMenu.java
+++ b/src/jalview/gui/ViewSelectionMenu.java
@@ -20,6 +20,9 @@
  */
 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;
@@ -35,8 +38,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
@@ -51,24 +52,15 @@ public class ViewSelectionMenu extends JMenu
 {
   public interface ViewSetProvider
   {
-    public AlignmentPanel[] getAllAlignmentPanels();
+    public AlignmentViewPanel[] getAllAlignmentPanels();
   }
 
   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 +80,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);
@@ -140,7 +132,7 @@ public class ViewSelectionMenu extends JMenu
   private void rebuild()
   {
     removeAll();
-    AlignmentPanel[] allviews = _allviews.getAllAlignmentPanels();
+    AlignmentViewPanel[] allviews = _allviews.getAllAlignmentPanels();
     if (allviews == null)
     {
       setVisible(false);
@@ -152,8 +144,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()
       {
 
@@ -217,11 +209,12 @@ public class ViewSelectionMenu extends JMenu
       invertSel.setEnabled(append);
       selectAll.setEnabled(append);
     }
-    for (final AlignmentPanel ap : allviews)
+    for (final AlignmentViewPanel ap : allviews)
     {
-      String nm = ((ap.getViewName() == null || ap.getViewName().length() == 0) ? ""
-              : ap.getViewName() + " for ")
-              + ap.alignFrame.getTitle();
+      String nm = ((ap.getViewName() == null
+              || ap.getViewName().length() == 0) ? ""
+                      : ap.getViewName() + " for ")
+              + ap.getTitle();
       final JCheckBoxMenuItem checkBox = new JCheckBoxMenuItem(nm,
               _selectedviews.contains(ap));
       checkBox.addItemListener(new ItemListener()