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 2a7743a..ed9f013 100644 (file)
--- a/src/jalview/gui/ViewSelectionMenu.java
+++ b/src/jalview/gui/ViewSelectionMenu.java
@@ -20,6 +20,7 @@
  */
 package jalview.gui;
 
+import jalview.api.AlignmentViewPanel;
 import jalview.util.MessageManager;
 
 import java.awt.Component;
@@ -51,12 +52,12 @@ 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;
 
@@ -79,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);
@@ -131,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);
@@ -208,12 +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();
+              + ap.getTitle();
       final JCheckBoxMenuItem checkBox = new JCheckBoxMenuItem(nm,
               _selectedviews.contains(ap));
       checkBox.addItemListener(new ItemListener()