X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequenceI.java;h=8f1d1602114789394801aaefef5d5ab35f8a5722;hb=747167089ecf8d6afc70d417f5a20352e029bd95;hp=d06adcbd4f68b5fefbef332c059de6844ffadca5;hpb=b5667f39acdf309cd92881b73edfda591e0acaf4;p=jalview.git

diff --git a/src/jalview/datamodel/SequenceI.java b/src/jalview/datamodel/SequenceI.java
index d06adcb..8f1d160 100755
--- a/src/jalview/datamodel/SequenceI.java
+++ b/src/jalview/datamodel/SequenceI.java
@@ -20,8 +20,10 @@
  */
 package jalview.datamodel;
 
+import jalview.datamodel.Sequence.DBModList;
 import jalview.datamodel.features.SequenceFeaturesI;
 import jalview.util.MapList;
+import jalview.ws.params.InvalidArgumentException;
 
 import java.util.BitSet;
 import java.util.Iterator;
@@ -49,7 +51,6 @@ public interface SequenceI extends ASequenceI
   public HiddenMarkovModel getHMM();
 
   public void setHMM(HiddenMarkovModel hmm);
-
   /**
    * Get the display name
    */
@@ -217,10 +218,10 @@ public interface SequenceI extends ASequenceI
    * from 1), or null if no residues are included in the range
    * 
    * @param fromColum
-   *          - first column base 1
+   *          - first column base 1. (0 and negative positions are rounded up)
    * @param toColumn
    *          - last column, base 1
-   * @return
+   * @return null if fromColum>toColumn
    */
   public ContiguousI findPositions(int fromColum, int toColumn);
 
@@ -359,14 +360,17 @@ public interface SequenceI extends ASequenceI
   /**
    * set the array of Database references for the sequence.
    * 
+   * BH 2019.02.04 changes param to DBModlist 
+   * 
    * @param dbs
    * @deprecated - use is discouraged since side-effects may occur if DBRefEntry
    *             set are not normalised.
+   * @throws InvalidArgumentException if the is not one created by Sequence itself
    */
   @Deprecated
-  public void setDBRefs(DBRefEntry[] dbs);
+  public void setDBRefs(DBModList<DBRefEntry> dbs);
 
-  public DBRefEntry[] getDBRefs();
+  public DBModList<DBRefEntry> getDBRefs();
 
   /**
    * add the given entry to the list of DBRefs for this sequence, or replace a
@@ -445,6 +449,17 @@ public interface SequenceI extends ASequenceI
           String label);
 
   /**
+   * Returns a (possibly empty) list of any annotations that match on given
+   * calcId (source), label (type) and description (observation instance).
+   * Null values do not match.
+   * 
+   * @param calcId
+   * @param label
+   * @param description
+   */
+  public List<AlignmentAnnotation> getAlignmentAnnotations(String calcId,
+          String label, String description);
+  /**
    * create a new dataset sequence (if necessary) for this sequence and sets
    * this sequence to refer to it. This call will move any features or
    * references on the sequence onto the dataset. It will also make a duplicate
@@ -503,7 +518,6 @@ public interface SequenceI extends ASequenceI
    *         list
    */
   public List<DBRefEntry> getPrimaryDBRefs();
-
   /**
    * Answers true if the sequence has annotation for Hidden Markov Model
    * information content, else false
@@ -547,7 +561,7 @@ public interface SequenceI extends ASequenceI
    * @param c1
    * @param c2
    */
-  int replace(char c1, char c2);
+  public int replace(char c1, char c2);
 
   /**
    * Answers the GeneLociI, or null if not known
@@ -577,7 +591,7 @@ public interface SequenceI extends ASequenceI
    *          the iterator to use
    * @return a String corresponding to the sequence
    */
-  String getSequenceStringFromIterator(Iterator<int[]> it);
+  public String getSequenceStringFromIterator(Iterator<int[]> it);
 
   /**
    * Locate the first position in this sequence which is not contained in an
@@ -587,7 +601,8 @@ public interface SequenceI extends ASequenceI
    *          iterator over regions
    * @return first residue not contained in regions
    */
-  int firstResidueOutsideIterator(Iterator<int[]> it);
+  public int firstResidueOutsideIterator(Iterator<int[]> it);
+
 
   /**
    * Answers true if this sequence has an associated Hidden Markov Model
@@ -596,3 +611,4 @@ public interface SequenceI extends ASequenceI
    */
   boolean hasHMMProfile();
 }
+