Merge branch 'feature/intervalStoreJ' into merge/JAL-3140
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 1 Mar 2019 09:41:58 +0000 (09:41 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 1 Mar 2019 09:41:58 +0000 (09:41 +0000)
1  2 
.classpath
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceI.java
src/jalview/datamodel/features/FeatureStore.java
src/jalview/datamodel/features/SequenceFeatures.java
test/jalview/datamodel/SequenceTest.java
test/jalview/datamodel/features/FeatureStoreTest.java

diff --cc .classpath
Simple merge
Simple merge
@@@ -206,17 -206,14 +206,17 @@@ public interface SequenceI extends ASeq
    public int findPosition(int i);
  
    /**
 -   * Returns the from-to sequence positions (start..) for the given column
 -   * positions (1..), or null if no residues are included in the range
 +   * Returns the sequence positions for first and last residues lying within the
 +   * given column positions [fromColum,toColumn] (where columns are numbered
 +   * from 1), or null if no residues are included in the range
     * 
     * @param fromColum
 +   *          - first column base 1
     * @param toColumn
 +   *          - last column, base 1
     * @return
     */
-   public Range findPositions(int fromColum, int toColumn);
+   public ContiguousI findPositions(int fromColum, int toColumn);
  
    /**
     * Returns an int array where indices correspond to each residue in the