X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationColumnChooser.java;h=00c42173932aefabdacc54e29c7bd2f32cd50ab1;hb=5d59bb58f5bcecc6b240d125e13bbe1f1868f681;hp=9f3aa7b6da892a9534fa07c5e7ff1aedd8e4d433;hpb=95de746a08351b07696a0c455ef37d866c8104d2;p=jalview.git

diff --git a/src/jalview/gui/AnnotationColumnChooser.java b/src/jalview/gui/AnnotationColumnChooser.java
index 9f3aa7b..00c4217 100644
--- a/src/jalview/gui/AnnotationColumnChooser.java
+++ b/src/jalview/gui/AnnotationColumnChooser.java
@@ -1,6 +1,5 @@
 package jalview.gui;
 
-import jalview.controller.AlignViewController;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.ColumnSelection;
 import jalview.schemes.AnnotationColourGradient;
@@ -18,7 +17,6 @@ import java.awt.event.ItemListener;
 import java.util.Iterator;
 
 import javax.swing.ButtonGroup;
-import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JInternalFrame;
@@ -39,9 +37,9 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
 
   private JComboBox<String> annotations;
 
-  private JButton ok = new JButton();
-
-  private JButton cancel = new JButton();
+  // private JButton ok = new JButton();
+  //
+  // private JButton cancel = new JButton();
 
   private JPanel actionPanel = new JPanel();
 
@@ -51,7 +49,6 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
 
   private CardLayout switchableViewsLayout = (CardLayout) (switchableViewsPanel
           .getLayout());
-
   private JPanel noGraphFilterView = new JPanel();
 
   private JPanel graphFilterView = new JPanel();
@@ -437,9 +434,8 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
       }
     }
 
-    AlignViewController.filterAnnotations(
-            getCurrentAnnotation().annotations, filterParams,
-            av.getColumnSelection());
+    av.getColumnSelection().filterAnnotations(
+            getCurrentAnnotation().annotations, filterParams);
 
     av.showAllHiddenColumns();
     if (getActionOption() == ACTION_OPTION_HIDE)