X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequenceI.java;h=7ecb4ed53d54a0a59493b1c4fb0ffb2eaed75a7d;hb=refs%2Fheads%2Ffeatures%2FJAL-653_JAL-1766_htslib_refseqsupport;hp=dc52a1cc68aa431f79f46646ec0462783e0f29ce;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/jalview/datamodel/SequenceI.java b/src/jalview/datamodel/SequenceI.java
index dc52a1c..7ecb4ed 100755
--- a/src/jalview/datamodel/SequenceI.java
+++ b/src/jalview/datamodel/SequenceI.java
@@ -1,35 +1,38 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.datamodel;
-
+import java.util.List;
import java.util.Vector;
import fr.orsay.lri.varna.models.rna.RNA;
/**
- * DOCUMENT ME!
+ * Methods for manipulating a sequence, its metadata and related annotation in
+ * an alignment or dataset.
*
* @author $author$
* @version $Revision$
*/
-public interface SequenceI
+public interface SequenceI extends ASequenceI
{
/**
* Set the display name for the sequence
@@ -132,23 +135,26 @@ public interface SequenceI
public char[] getSequence(int start, int end);
/**
- * create a new sequence object from start to end of this sequence
+ * create a new sequence object with a subsequence of this one but sharing the
+ * same dataset sequence
*
* @param start
- * int
+ * int index for start position (base 0, inclusive)
* @param end
- * int
+ * int index for end position (base 0, exclusive)
+ *
* @return SequenceI
+ * @note implementations may use getSequence to get the sequence data
*/
public SequenceI getSubSequence(int start, int end);
/**
- * DOCUMENT ME!
+ * get the i'th character in this sequence's local reference frame (ie from
+ * 0-number of characters lying from start-end)
*
* @param i
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * index
+ * @return character or ' '
*/
public char getCharAt(int i);
@@ -168,8 +174,7 @@ public interface SequenceI
public String getDescription();
/**
- * Return the alignment column for a sequence position * Return the alignment
- * position for a sequence position
+ * Return the alignment column for a sequence position
*
* @param pos
* lying from start to end
@@ -187,7 +192,7 @@ public interface SequenceI
* Returns the sequence position for an alignment position
*
* @param i
- * column index in alignment (from 1)
+ * column index in alignment (from 0.. ids);
/**
- * DOCUMENT ME!
+ * Returns a list
*
* @return DOCUMENT ME!
*/
- public Vector getPDBId();
+ public Vector getAllPDBEntries();
/**
- * add entry to the vector of PDBIds, if it isn't in the list already
+ * Adds the entry to the *normalised* list of PDBIds.
+ *
+ * If a PDBEntry is passed with the same entry.getID() string as one already
+ * in the list, or one is added that appears to be the same but has a chain ID
+ * appended, then the existing PDBEntry will be updated with the new
+ * attributes instead, unless the entries have distinct chain codes or
+ * associated structure files.
*
* @param entry
+ * @return true if the entry was added, false if updated
*/
- public void addPDBId(PDBEntry entry);
+ public boolean addPDBId(PDBEntry entry);
/**
* update the list of PDBEntrys to include any DBRefEntrys citing structural
@@ -291,9 +317,17 @@ public interface SequenceI
public void setVamsasId(String id);
- public void setDBRef(DBRefEntry[] dbs);
+ /**
+ * set the array of Database references for the sequence.
+ *
+ * @param dbs
+ * @deprecated - use is discouraged since side-effects may occur if DBRefEntry
+ * set are not normalised.
+ */
+ @Deprecated
+ public void setDBRefs(DBRefEntry[] dbs);
- public DBRefEntry[] getDBRef();
+ public DBRefEntry[] getDBRefs();
/**
* add the given entry to the list of DBRefs for this sequence, or replace a
@@ -303,7 +337,14 @@ public interface SequenceI
*/
public void addDBRef(DBRefEntry entry);
- public void addSequenceFeature(SequenceFeature sf);
+ /**
+ * Adds the given sequence feature and returns true, or returns false if it is
+ * already present on the sequence
+ *
+ * @param sf
+ * @return
+ */
+ public boolean addSequenceFeature(SequenceFeature sf);
public void deleteFeature(SequenceFeature sf);
@@ -311,8 +352,22 @@ public interface SequenceI
public SequenceI getDatasetSequence();
+ /**
+ * Returns a new array containing this sequence's annotations, or null.
+ */
public AlignmentAnnotation[] getAnnotation();
+ /**
+ * Returns true if this sequence has the given annotation (by object
+ * identity).
+ */
+ public boolean hasAnnotation(AlignmentAnnotation ann);
+
+ /**
+ * Add the given annotation, if not already added, and set its sequence ref to
+ * be this sequence. Does nothing if this sequence's annotations already
+ * include this annotation (by identical object reference).
+ */
public void addAlignmentAnnotation(AlignmentAnnotation annotation);
public void removeAlignmentAnnotation(AlignmentAnnotation annotation);
@@ -341,9 +396,21 @@ public interface SequenceI
public AlignmentAnnotation[] getAnnotation(String label);
/**
+ * Returns a (possibly empty) list of any annotations that match on given
+ * calcId (source) and label (type). Null values do not match.
+ *
+ * @param calcId
+ * @param label
+ */
+ public List getAlignmentAnnotations(String calcId,
+ String label);
+
+ /**
* 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.
+ * references on the sequence onto the dataset. It will also make a duplicate
+ * of existing annotation rows for the dataset sequence, rather than relocate
+ * them in order to preserve external references (since 2.8.2).
*
* @return dataset sequence for this sequence
*/
@@ -351,7 +418,9 @@ public interface SequenceI
/**
* Transfer any database references or annotation from entry under a sequence
- * mapping.
+ * mapping.
+ * Note: DOES NOT transfer sequence associated alignment annotation
+ *
*
* @param entry
* @param mp
@@ -369,17 +438,52 @@ public interface SequenceI
* @return The index of the sequence in the alignment
*/
public int getIndex();
-
+
/**
* @return The RNA of the sequence in the alignment
*/
-
+
public RNA getRNA();
-
+
/**
- * @param rna The RNA.
+ * @param rna
+ * The RNA.
*/
public void setRNA(RNA rna);
-
+ /**
+ *
+ * @return list of insertions (gap characters) in sequence
+ */
+ public List getInsertions();
+
+ /**
+ * Given a pdbId String, return the equivalent PDBEntry if available in the
+ * given sequence
+ *
+ * @param pdbId
+ * @return
+ */
+ public PDBEntry getPDBEntry(String pdbId);
+
+ /**
+ * Get all primary database/accessions for this sequence's data. These
+ * DBRefEntry are expected to resolve to a valid record in the associated
+ * external database, either directly or via a provided 1:1 Mapping.
+ *
+ * @return just the primary references (if any) for this sequence, or an empty
+ * list
+ */
+ public List getPrimaryDBRefs();
+
+ /**
+ * Returns a (possibly empty) list of sequence features of the given type that
+ * overlap the range from-to (inclusive)
+ *
+ * @param type
+ * @param from
+ * @param to
+ * @return
+ */
+ List findFeatures(String type, int from, int to);
}