Merge branch 'features/JAL-2446NCList' into

features/JAL-2574findFeaturesByColumn

Conflicts:
	src/jalview/datamodel/SequenceI.java

diff --cc src/jalview/datamodel/Sequence.java
Simple merge

diff --cc src/jalview/datamodel/SequenceI.java
index ec76cb9,cf9d6ad..1615bee
--- 1/src/jalview/datamodel/SequenceI.java
--- 2/src/jalview/datamodel/SequenceI.java
+++ b/src/jalview/datamodel/SequenceI.java
@@@ -486,18 -511,21 +487,25 @@@ public interface SequenceI extends ASeq
    public List<DBRefEntry> getPrimaryDBRefs();
  
    /**
 -   * Returns a (possibly empty) list of sequence features that overlap the range
 -   * from-to (inclusive), optionally restricted to one or more specified feature
 -   * types
 +   * Returns a (possibly empty) list of sequence features that overlap the given
 +   * alignment column range, optionally restricted to one or more specified
 +   * feature types. If the range is all gaps, then features which enclose it are
 +   * included (but not contact features).
     * 
 -   * @param from
 -   * @param to
 +   * @param fromCol
 +   *          start column of range inclusive (1..)
 +   * @param toCol
 +   *          end column of range inclusive (1..)
     * @param types
 +   *          optional feature types to restrict results to
     * @return
     */
 -  List<SequenceFeature> findFeatures(int from, int to, String... types);
 +  List<SequenceFeature> findFeatures(int fromCol, int toCol, String... types);
+   
+   /**
+    * 
+    * @return BitSet corresponding to index [0,length) where Comparison.isGap()
+    *         returns true.
+    */
+   BitSet getInsertionsAsBits();
  }

diff --cc src/jalview/workers/ColumnCounterSetWorker.java
Simple merge

diff --cc test/jalview/datamodel/SequenceTest.java
Simple merge