git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
src
/
jalview
/
datamodel
/
AlignmentI.java
diff --git
a/src/jalview/datamodel/AlignmentI.java
b/src/jalview/datamodel/AlignmentI.java
index
4ae8ba2
..
1d37fa6
100755
(executable)
--- a/
src/jalview/datamodel/AlignmentI.java
+++ b/
src/jalview/datamodel/AlignmentI.java
@@
-41,7
+41,8
@@
public interface AlignmentI extends AnnotatedCollectionI
*
* Calculates the maximum width of the alignment, including gaps.
*
*
* Calculates the maximum width of the alignment, including gaps.
*
- * @return Greatest sequence length within alignment.
+ * @return Greatest sequence length within alignment, or -1 if no sequences
+ * present
*/
@Override
int getWidth();
*/
@Override
int getWidth();
@@
-107,11
+108,14
@@
public interface AlignmentI extends AnnotatedCollectionI
* Used to set a particular index of the alignment with the given sequence.
*
* @param i
* Used to set a particular index of the alignment with the given sequence.
*
* @param i
- * Index of sequence to be updated.
+ * Index of sequence to be updated. if i>length, sequence will be
+ * added to end, with no intervening positions.
* @param seq
* @param seq
- * New sequence to be inserted.
+ * New sequence to be inserted. The existing sequence at position i
+ * will be replaced.
+ * @return existing sequence (or null if i>current length)
*/
*/
- void setSequenceAt(int i, SequenceI seq);
+ SequenceI replaceSequenceAt(int i, SequenceI seq);
/**
* Deletes a sequence from the alignment
/**
* Deletes a sequence from the alignment
@@
-305,7
+309,7
@@
public interface AlignmentI extends AnnotatedCollectionI
* @return Alignment containing dataset sequences or null of this is a
* dataset.
*/
* @return Alignment containing dataset sequences or null of this is a
* dataset.
*/
- Alignment getDataset();
+ AlignmentI getDataset();
/**
* Set the associated dataset for the alignment, or create one.
/**
* Set the associated dataset for the alignment, or create one.
@@
-313,7
+317,7
@@
public interface AlignmentI extends AnnotatedCollectionI
* @param dataset
* The dataset alignment or null to construct one.
*/
* @param dataset
* The dataset alignment or null to construct one.
*/
- void setDataset(Alignment dataset);
+ void setDataset(AlignmentI dataset);
/**
* pads sequences with gaps (to ensure the set looks like an alignment)
/**
* pads sequences with gaps (to ensure the set looks like an alignment)
@@
-363,14
+367,6
@@
public interface AlignmentI extends AnnotatedCollectionI
void addCodonFrame(AlignedCodonFrame codons);
/**
void addCodonFrame(AlignedCodonFrame codons);
/**
- * add a set of aligned codons mappings for this alignment, apart from any
- * duplicates which are ignored
- *
- * @param codons
- */
- void addCodonFrames(Iterable<AlignedCodonFrame> codons);
-
- /**
* remove a particular codon frame reference from this alignment
*
* @param codons
* remove a particular codon frame reference from this alignment
*
* @param codons