From: Charles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 13 Jan 2015 15:55:37 +0000 (+0000)
Subject: Merge branch 'features/JAL-1553_select-columns-by-annotation' into develop
X-Git-Tag: Jalview_2_9~119
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=79055a2b32dc168ce6fb0b9de366007945d51254;p=jalview.git

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

79055a2b32dc168ce6fb0b9de366007945d51254
diff --cc src/jalview/gui/AlignViewport.java
index dd61c79,cff9e94..29d936f
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@@ -138,9 -148,10 +138,9 @@@ public class AlignViewport extends Alig
    Color textColour = Color.black;
  
    Color textColour2 = Color.white;
 -
    private boolean rightAlignIds = false;
  
-   private AnnotationColumnSelection currentAnnotationColumnSelectionState;
+   private AnnotationColumnChooser currentAnnotationColumnSelectionState;
    /**
     * Creates a new AlignViewport object.
     *