JAL-3438 spotless for 2.11.2.0

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

diff --git a/src/jalview/gui/ViewSelectionMenu.java b/src/jalview/gui/ViewSelectionMenu.java
index d906c6d..f77f410 100644 (file)
--- a/src/jalview/gui/ViewSelectionMenu.java
+++ b/src/jalview/gui/ViewSelectionMenu.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,7 +20,9 @@
  */
 package jalview.gui;
 
+import jalview.api.AlignmentViewPanel;
 import jalview.util.MessageManager;
+import jalview.util.Platform;
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;
@@ -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)
           {
           }