/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 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.
- *
+ *
* 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.datamodel;
* to the residues of this sequence
*/
Vector annotation;
-
+
/**
- * The index of the sequence in a MSA
+ * The index of the sequence in a MSA
*/
int index = -1;
void checkValidRange()
{
- // Note: JAL-774 : http://issues.jalview.org/browse/JAL-774?focusedCommentId=11239&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-11239
+ // Note: JAL-774 :
+ // http://issues.jalview.org/browse/JAL-774?focusedCommentId=11239&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-11239
{
int endRes = 0;
for (int j = 0; j < sequence.length; j++)
endRes += start - 1;
}
- if (end<endRes) {
+ if (end < endRes)
+ {
end = endRes;
}
}
return this.description;
}
- /**
- * Return the alignment position for a sequence position
- *
- * @param pos
- * lying from start to end
+ /*
+ * (non-Javadoc)
*
- * @return aligned position of residue pos
+ * @see jalview.datamodel.SequenceI#findIndex(int)
*/
public int findIndex(int pos)
{
{
tmp = new char[i];
System.arraycopy(sequence, 0, tmp, 0, i);
+ j=sequence.length;
}
else
{
System.arraycopy(sequence, j, tmp, i, sequence.length - j);
}
boolean createNewDs = false;
+ // TODO: take a look at the new dataset creation validation method below -
+ // this could become time comsuming for large sequences - consider making it
+ // more efficient
for (int s = i; s < j; s++)
{
if (jalview.schemes.ResidueProperties.aaIndex[sequence[s]] != 23)
{
this.annotation = new Vector();
}
-
- this.annotation.addElement(annotation);
+ if (!this.annotation.contains(annotation))
+ {
+ this.annotation.addElement(annotation);
+ }
annotation.setSequenceRef(this);
}
datasetSequence.setPDBId(getPDBId());
setPDBId(null);
datasetSequence.updatePDBIds();
+ if (annotation != null)
+ {
+ Vector<AlignmentAnnotation> _annot = annotation;
+ annotation = null;
+ for (AlignmentAnnotation aa : _annot)
+ {
+ aa.sequenceRef = datasetSequence;
+ aa.adjustForAlignment(); // uses annotation's own record of
+ // sequence-column mapping
+ datasetSequence.addAlignmentAnnotation(aa);
+ }
+ }
}
return datasetSequence;
}
}
/**
- * @return The index (zero-based) on this sequence in the MSA.
- * It returns {@code -1} if this information is not available.
+ * @return The index (zero-based) on this sequence in the MSA. It returns
+ * {@code -1} if this information is not available.
*/
- public int getIndex() { return index; }
-
+ public int getIndex()
+ {
+ return index;
+ }
+
/**
- * Defines the position of this sequence in the MSA.
- * Use the value {@code -1} if this information is undefined.
+ * Defines the position of this sequence in the MSA. Use the value {@code -1}
+ * if this information is undefined.
*
- * @param The position for this sequence. This value is zero-based (zero for this first sequence)
+ * @param The
+ * position for this sequence. This value is zero-based (zero for
+ * this first sequence)
*/
- public void setIndex(int value) { index = value; }
+ public void setIndex(int value)
+ {
+ index = value;
+ }
}