Merge branch 'develop' into bug/JAL-2346annotationChoice

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

diff --git a/src/jalview/gui/AnnotationRowFilter.java b/src/jalview/gui/AnnotationRowFilter.java
index 7bf8721..c1dcee7 100644 (file)
--- a/src/jalview/gui/AnnotationRowFilter.java
+++ b/src/jalview/gui/AnnotationRowFilter.java
@@ -59,9 +59,17 @@ public abstract class AnnotationRowFilter extends JPanel
   protected int[] annmap;
 
   protected boolean adjusting = false;
+  
+  protected JCheckBox currentColours = new JCheckBox();
+
+  protected JPanel minColour = new JPanel();
+
+  protected JPanel maxColour = new JPanel();
 
   protected JCheckBox seqAssociated = new JCheckBox();
 
+  protected JCheckBox thresholdIsMin = new JCheckBox();
+
   protected JSlider slider = new JSlider();
 
   protected JTextField thresholdValue = new JTextField(20);
@@ -363,7 +371,7 @@ public abstract class AnnotationRowFilter extends JPanel
     }
   }
 
-  protected AlignmentAnnotation getCurrentAnnotation()
+  public AlignmentAnnotation getCurrentAnnotation()
   {
     return currentAnnotation;
   }