JAL-1553 added applet support for the select-column-by-annotation-row feature

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

diff --git a/src/jalview/gui/AnnotationColumnChooser.java b/src/jalview/gui/AnnotationColumnChooser.java
index 9f3aa7b..00c4217 100644 (file)
--- 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)