Merge branch 'features/JAL-1553_select-columns-by-annotation' into develop

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

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index dd61c79..29d936f 100644 (file)
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -140,7 +140,7 @@ public class AlignViewport extends AlignmentViewport implements
   Color textColour2 = Color.white;
   private boolean rightAlignIds = false;
 
-  private AnnotationColumnSelection currentAnnotationColumnSelectionState;
+  private AnnotationColumnChooser currentAnnotationColumnSelectionState;
   /**
    * Creates a new AlignViewport object.
    * 
@@ -1251,13 +1251,13 @@ public class AlignViewport extends AlignmentViewport implements
     this.rightAlignIds = rightAlignIds;
   }
 
-  public AnnotationColumnSelection getCurrentAnnotationColumnSelectionState()
+  public AnnotationColumnChooser getCurrentAnnotationColumnSelectionState()
   {
     return currentAnnotationColumnSelectionState;
   }
 
   public void setCurrentAnnotationColumnSelectionState(
-          AnnotationColumnSelection currentAnnotationColumnSelectionState)
+          AnnotationColumnChooser currentAnnotationColumnSelectionState)
   {
     this.currentAnnotationColumnSelectionState = currentAnnotationColumnSelectionState;
   }