X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fdatamodel%2FSequence.java;h=b0faf21132bf9cdaf21ec9be246833e5cfd2f4d0;hb=refs%2Fheads%2Ffeatures%2FJAL-2465_No-mapping_Jmol-structures-loaded-via-url;hp=d03caaa31e7036a9c9098a54c9ccb7c933abfb3c;hpb=c07ef0cc5eabc7df4eb15bb3541a702278783f05;p=jalview.git
diff --git a/src/jalview/datamodel/Sequence.java b/src/jalview/datamodel/Sequence.java
index d03caaa..b0faf21 100755
--- a/src/jalview/datamodel/Sequence.java
+++ b/src/jalview/datamodel/Sequence.java
@@ -1,26 +1,37 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * 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 jalview.analysis.AlignSeq;
-
+import jalview.api.DBRefEntryI;
+import jalview.util.Comparison;
+import jalview.util.DBRefUtils;
+import jalview.util.MapList;
+import jalview.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.Enumeration;
+import java.util.List;
import java.util.Vector;
import fr.orsay.lri.varna.models.rna.RNA;
@@ -32,7 +43,7 @@ import fr.orsay.lri.varna.models.rna.RNA;
* @author $author$
* @version $Revision$
*/
-public class Sequence implements SequenceI
+public class Sequence extends ASequence implements SequenceI
{
SequenceI datasetSequence;
@@ -46,19 +57,21 @@ public class Sequence implements SequenceI
int end;
- Vector pdbIds;
+ Vector pdbIds;
String vamsasId;
DBRefEntry[] dbrefs;
-
+
RNA rna;
/**
* This annotation is displayed below the alignment but the positions are tied
* to the residues of this sequence
+ *
+ * TODO: change to List<>
*/
- Vector annotation;
+ Vector annotation;
/**
* The index of the sequence in a MSA
@@ -83,20 +96,30 @@ public class Sequence implements SequenceI
*/
public Sequence(String name, String sequence, int start, int end)
{
- this.name = name;
- this.sequence = sequence.toCharArray();
- this.start = start;
- this.end = end;
- parseId();
- checkValidRange();
+ initSeqAndName(name, sequence.toCharArray(), start, end);
}
public Sequence(String name, char[] sequence, int start, int end)
{
- this.name = name;
- this.sequence = sequence;
- this.start = start;
- this.end = end;
+ initSeqAndName(name, sequence, start, end);
+ }
+
+ /**
+ * Stage 1 constructor - assign name, sequence, and set start and end fields.
+ * start and end are updated values from name2 if it ends with /start-end
+ *
+ * @param name2
+ * @param sequence2
+ * @param start2
+ * @param end2
+ */
+ protected void initSeqAndName(String name2, char[] sequence2, int start2,
+ int end2)
+ {
+ this.name = name2;
+ this.sequence = sequence2;
+ this.start = start2;
+ this.end = end2;
parseId();
checkValidRange();
}
@@ -114,7 +137,7 @@ public class Sequence implements SequenceI
.println("POSSIBLE IMPLEMENTATION ERROR: null sequence name passed to constructor.");
name = "";
}
- // Does sequence have the /start-end signiature?
+ // Does sequence have the /start-end signature?
if (limitrx.search(name))
{
name = limitrx.left();
@@ -165,12 +188,13 @@ public class Sequence implements SequenceI
}
/**
- * Creates a new Sequence object with new features, DBRefEntries,
- * AlignmentAnnotations, and PDBIds but inherits any existing dataset sequence
- * reference.
+ * Creates a new Sequence object with new AlignmentAnnotations but inherits
+ * any existing dataset sequence reference. If non exists, everything is
+ * copied.
*
* @param seq
- * DOCUMENT ME!
+ * if seq is a dataset sequence, behaves like a plain old copy
+ * constructor
*/
public Sequence(SequenceI seq)
{
@@ -189,25 +213,49 @@ public class Sequence implements SequenceI
*/
public Sequence(SequenceI seq, AlignmentAnnotation[] alAnnotation)
{
- this(seq.getName(), seq.getSequence(), seq.getStart(), seq.getEnd());
+ initSeqFrom(seq, alAnnotation);
+
+ }
+
+ /**
+ * does the heavy lifting when cloning a dataset sequence, or coping data from
+ * dataset to a new derived sequence.
+ *
+ * @param seq
+ * - source of attributes.
+ * @param alAnnotation
+ * - alignment annotation present on seq that should be copied onto
+ * this sequence
+ */
+ protected void initSeqFrom(SequenceI seq,
+ AlignmentAnnotation[] alAnnotation)
+ {
+ {
+ char[] oseq = seq.getSequence();
+ initSeqAndName(seq.getName(), Arrays.copyOf(oseq, oseq.length),
+ seq.getStart(), seq.getEnd());
+ }
description = seq.getDescription();
- if (seq.getSequenceFeatures() != null)
+ if (seq != datasetSequence)
{
- SequenceFeature[] sf = seq.getSequenceFeatures();
- for (int i = 0; i < sf.length; i++)
- {
- addSequenceFeature(new SequenceFeature(sf[i]));
- }
+ setDatasetSequence(seq.getDatasetSequence());
}
- setDatasetSequence(seq.getDatasetSequence());
- if (datasetSequence == null && seq.getDBRef() != null)
+ if (datasetSequence == null && seq.getDBRefs() != null)
{
- // only copy DBRefs if we really are a dataset sequence
- DBRefEntry[] dbr = seq.getDBRef();
+ // only copy DBRefs and seqfeatures if we really are a dataset sequence
+ DBRefEntry[] dbr = seq.getDBRefs();
for (int i = 0; i < dbr.length; i++)
{
addDBRef(new DBRefEntry(dbr[i]));
}
+ if (seq.getSequenceFeatures() != null)
+ {
+ SequenceFeature[] sf = seq.getSequenceFeatures();
+ for (int i = 0; i < sf.length; i++)
+ {
+ addSequenceFeature(new SequenceFeature(sf[i]));
+ }
+ }
}
if (seq.getAnnotation() != null)
{
@@ -234,30 +282,44 @@ public class Sequence implements SequenceI
}
}
}
- if (seq.getPDBId() != null)
+ if (seq.getAllPDBEntries() != null)
{
- Vector ids = seq.getPDBId();
- Enumeration e = ids.elements();
- while (e.hasMoreElements())
+ Vector ids = seq.getAllPDBEntries();
+ for (PDBEntry pdb : ids)
{
- this.addPDBId(new PDBEntry((PDBEntry) e.nextElement()));
+ this.addPDBId(new PDBEntry(pdb));
}
}
}
- /**
- * DOCUMENT ME!
- *
- * @param v
- * DOCUMENT ME!
- */
+ @Override
public void setSequenceFeatures(SequenceFeature[] features)
{
- sequenceFeatures = features;
+ if (datasetSequence == null)
+ {
+ sequenceFeatures = features;
+ }
+ else
+ {
+ if (datasetSequence.getSequenceFeatures() != features
+ && datasetSequence.getSequenceFeatures() != null
+ && datasetSequence.getSequenceFeatures().length > 0)
+ {
+ new Exception(
+ "Warning: JAL-2046 side effect ? Possible implementation error: overwriting dataset sequence features by setting sequence features on alignment")
+ .printStackTrace();
+ }
+ datasetSequence.setSequenceFeatures(features);
+ }
}
- public synchronized void addSequenceFeature(SequenceFeature sf)
+ @Override
+ public synchronized boolean addSequenceFeature(SequenceFeature sf)
{
+ if (sequenceFeatures == null && datasetSequence != null)
+ {
+ return datasetSequence.addSequenceFeature(sf);
+ }
if (sequenceFeatures == null)
{
sequenceFeatures = new SequenceFeature[0];
@@ -267,7 +329,7 @@ public class Sequence implements SequenceI
{
if (sequenceFeatures[i].equals(sf))
{
- return;
+ return false;
}
}
@@ -276,12 +338,18 @@ public class Sequence implements SequenceI
temp[sequenceFeatures.length] = sf;
sequenceFeatures = temp;
+ return true;
}
+ @Override
public void deleteFeature(SequenceFeature sf)
{
if (sequenceFeatures == null)
{
+ if (datasetSequence != null)
+ {
+ datasetSequence.deleteFeature(sf);
+ }
return;
}
@@ -320,25 +388,48 @@ public class Sequence implements SequenceI
}
/**
- * DOCUMENT ME!
+ * Returns the sequence features (if any), looking first on the sequence, then
+ * on its dataset sequence, and so on until a non-null value is found (or
+ * none). This supports retrieval of sequence features stored on the sequence
+ * (as in the applet) or on the dataset sequence (as in the Desktop version).
*
- * @return DOCUMENT ME!
+ * @return
*/
+ @Override
public SequenceFeature[] getSequenceFeatures()
{
- return sequenceFeatures;
+ SequenceFeature[] features = sequenceFeatures;
+
+ SequenceI seq = this;
+ int count = 0; // failsafe against loop in sequence.datasetsequence...
+ while (features == null && seq.getDatasetSequence() != null
+ && count++ < 10)
+ {
+ seq = seq.getDatasetSequence();
+ features = ((Sequence) seq).sequenceFeatures;
+ }
+ return features;
}
- public void addPDBId(PDBEntry entry)
+ @Override
+ public boolean addPDBId(PDBEntry entry)
{
if (pdbIds == null)
{
- pdbIds = new Vector();
+ pdbIds = new Vector();
+ pdbIds.add(entry);
+ return true;
}
- if (!pdbIds.contains(entry))
+
+ for (PDBEntry pdbe : pdbIds)
{
- pdbIds.addElement(entry);
+ if (pdbe.updateFrom(entry))
+ {
+ return false;
+ }
}
+ pdbIds.addElement(entry);
+ return true;
}
/**
@@ -347,7 +438,8 @@ public class Sequence implements SequenceI
* @param id
* DOCUMENT ME!
*/
- public void setPDBId(Vector id)
+ @Override
+ public void setPDBId(Vector id)
{
pdbIds = id;
}
@@ -357,9 +449,10 @@ public class Sequence implements SequenceI
*
* @return DOCUMENT ME!
*/
- public Vector getPDBId()
+ @Override
+ public Vector getAllPDBEntries()
{
- return pdbIds;
+ return pdbIds == null ? new Vector() : pdbIds;
}
/**
@@ -367,6 +460,7 @@ public class Sequence implements SequenceI
*
* @return DOCUMENT ME!
*/
+ @Override
public String getDisplayId(boolean jvsuffix)
{
StringBuffer result = new StringBuffer(name);
@@ -384,6 +478,7 @@ public class Sequence implements SequenceI
* @param name
* DOCUMENT ME!
*/
+ @Override
public void setName(String name)
{
this.name = name;
@@ -395,6 +490,7 @@ public class Sequence implements SequenceI
*
* @return DOCUMENT ME!
*/
+ @Override
public String getName()
{
return this.name;
@@ -406,6 +502,7 @@ public class Sequence implements SequenceI
* @param start
* DOCUMENT ME!
*/
+ @Override
public void setStart(int start)
{
this.start = start;
@@ -416,6 +513,7 @@ public class Sequence implements SequenceI
*
* @return DOCUMENT ME!
*/
+ @Override
public int getStart()
{
return this.start;
@@ -427,6 +525,7 @@ public class Sequence implements SequenceI
* @param end
* DOCUMENT ME!
*/
+ @Override
public void setEnd(int end)
{
this.end = end;
@@ -437,6 +536,7 @@ public class Sequence implements SequenceI
*
* @return DOCUMENT ME!
*/
+ @Override
public int getEnd()
{
return this.end;
@@ -447,6 +547,7 @@ public class Sequence implements SequenceI
*
* @return DOCUMENT ME!
*/
+ @Override
public int getLength()
{
return this.sequence.length;
@@ -458,22 +559,26 @@ public class Sequence implements SequenceI
* @param seq
* DOCUMENT ME!
*/
+ @Override
public void setSequence(String seq)
{
this.sequence = seq.toCharArray();
checkValidRange();
}
+ @Override
public String getSequenceAsString()
{
return new String(sequence);
}
+ @Override
public String getSequenceAsString(int start, int end)
{
return new String(getSequence(start, end));
}
+ @Override
public char[] getSequence()
{
return sequence;
@@ -484,10 +589,13 @@ public class Sequence implements SequenceI
*
* @see jalview.datamodel.SequenceI#getSequence(int, int)
*/
+ @Override
public char[] getSequence(int start, int end)
{
if (start < 0)
+ {
start = 0;
+ }
// JBPNote - left to user to pad the result here (TODO:Decide on this
// policy)
if (start >= sequence.length)
@@ -506,16 +614,7 @@ public class Sequence implements SequenceI
return reply;
}
- /**
- * make a new Sequence object from start to end (including gaps) over this
- * seqeunce
- *
- * @param start
- * int
- * @param end
- * int
- * @return SequenceI
- */
+ @Override
public SequenceI getSubSequence(int start, int end)
{
if (start < 0)
@@ -544,16 +643,15 @@ public class Sequence implements SequenceI
}
/**
- * DOCUMENT ME!
+ * Returns the character of the aligned sequence at the given position (base
+ * zero), or space if the position is not within the sequence's bounds
*
- * @param i
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * @return
*/
+ @Override
public char getCharAt(int i)
{
- if (i < sequence.length)
+ if (i >= 0 && i < sequence.length)
{
return sequence[i];
}
@@ -569,6 +667,7 @@ public class Sequence implements SequenceI
* @param desc
* DOCUMENT ME!
*/
+ @Override
public void setDescription(String desc)
{
this.description = desc;
@@ -579,6 +678,7 @@ public class Sequence implements SequenceI
*
* @return DOCUMENT ME!
*/
+ @Override
public String getDescription()
{
return this.description;
@@ -589,6 +689,7 @@ public class Sequence implements SequenceI
*
* @see jalview.datamodel.SequenceI#findIndex(int)
*/
+ @Override
public int findIndex(int pos)
{
// returns the alignment position for a residue
@@ -615,14 +716,7 @@ public class Sequence implements SequenceI
}
}
- /**
- * Returns the sequence position for an alignment position
- *
- * @param i
- * column index in alignment (from 1)
- *
- * @return residue number for residue (left of and) nearest ith column
- */
+ @Override
public int findPosition(int i)
{
int j = 0;
@@ -648,6 +742,7 @@ public class Sequence implements SequenceI
* @return int[SequenceI.getEnd()-SequenceI.getStart()+1] or null if no
* residues in SequenceI object
*/
+ @Override
public int[] gapMap()
{
String seq = jalview.analysis.AlignSeq.extractGaps(
@@ -669,11 +764,7 @@ public class Sequence implements SequenceI
return map;
}
- /*
- * (non-Javadoc)
- *
- * @see jalview.datamodel.SequenceI#findPositionMap()
- */
+ @Override
public int[] findPositionMap()
{
int map[] = new int[sequence.length];
@@ -693,37 +784,55 @@ public class Sequence implements SequenceI
return map;
}
- /*
- * (non-Javadoc)
- *
- * @see jalview.datamodel.SequenceI#deleteChars(int, int)
- */
- public void deleteChars(int i, int j)
+ @Override
+ public List getInsertions()
{
- int newstart = start, newend = end;
- if (i >= sequence.length)
+ ArrayList map = new ArrayList();
+ int lastj = -1, j = 0;
+ int pos = start;
+ int seqlen = sequence.length;
+ while ((j < seqlen))
{
- return;
+ if (jalview.util.Comparison.isGap(sequence[j]))
+ {
+ if (lastj == -1)
+ {
+ lastj = j;
+ }
+ }
+ else
+ {
+ if (lastj != -1)
+ {
+ map.add(new int[] { lastj, j - 1 });
+ lastj = -1;
+ }
+ }
+ j++;
}
-
- char[] tmp;
-
- if (j >= sequence.length)
+ if (lastj != -1)
{
- tmp = new char[i];
- System.arraycopy(sequence, 0, tmp, 0, i);
- j=sequence.length;
+ map.add(new int[] { lastj, j - 1 });
+ lastj = -1;
}
- else
+ return map;
+ }
+
+ @Override
+ public void deleteChars(int i, int j)
+ {
+ int newstart = start, newend = end;
+ if (i >= sequence.length || i < 0)
{
- tmp = new char[sequence.length - j + i];
- System.arraycopy(sequence, 0, tmp, 0, i);
- System.arraycopy(sequence, j, tmp, i, sequence.length - j);
+ return;
}
+
+ char[] tmp = StringUtils.deleteChars(sequence, i, 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
+ // TODO: take a (second look) at the dataset creation validation method for
+ // the very large sequence case
+ int eindex = -1, sindex = -1;
+ boolean ecalc = false, scalc = false;
for (int s = i; s < j; s++)
{
if (jalview.schemes.ResidueProperties.aaIndex[sequence[s]] != 23)
@@ -734,7 +843,11 @@ public class Sequence implements SequenceI
}
else
{
- int sindex = findIndex(start) - 1;
+ if (!scalc)
+ {
+ sindex = findIndex(start) - 1;
+ scalc = true;
+ }
if (sindex == s)
{
// delete characters including start of sequence
@@ -744,7 +857,11 @@ public class Sequence implements SequenceI
else
{
// delete characters after start.
- int eindex = findIndex(end) - 1;
+ if (!ecalc)
+ {
+ eindex = findIndex(end) - 1;
+ ecalc = true;
+ }
if (eindex < j)
{
// delete characters at end of sequence
@@ -776,16 +893,7 @@ public class Sequence implements SequenceI
sequence = tmp;
}
- /**
- * DOCUMENT ME!
- *
- * @param i
- * DOCUMENT ME!
- * @param c
- * DOCUMENT ME!
- * @param chop
- * DOCUMENT ME!
- */
+ @Override
public void insertCharAt(int i, int length, char c)
{
char[] tmp = new char[sequence.length + length];
@@ -815,99 +923,132 @@ public class Sequence implements SequenceI
sequence = tmp;
}
+ @Override
public void insertCharAt(int i, char c)
{
insertCharAt(i, 1, c);
}
+ @Override
public String getVamsasId()
{
return vamsasId;
}
+ @Override
public void setVamsasId(String id)
{
vamsasId = id;
}
- public void setDBRef(DBRefEntry[] dbref)
+ @Override
+ public void setDBRefs(DBRefEntry[] dbref)
{
+ if (dbrefs == null && datasetSequence != null
+ && this != datasetSequence)
+ {
+ datasetSequence.setDBRefs(dbref);
+ return;
+ }
dbrefs = dbref;
+ if (dbrefs != null)
+ {
+ DBRefUtils.ensurePrimaries(this);
+ }
}
- public DBRefEntry[] getDBRef()
+ @Override
+ public DBRefEntry[] getDBRefs()
{
if (dbrefs == null && datasetSequence != null
&& this != datasetSequence)
{
- return datasetSequence.getDBRef();
+ return datasetSequence.getDBRefs();
}
return dbrefs;
}
+ @Override
public void addDBRef(DBRefEntry entry)
{
+ if (datasetSequence != null)
+ {
+ datasetSequence.addDBRef(entry);
+ return;
+ }
+
if (dbrefs == null)
{
dbrefs = new DBRefEntry[0];
}
- int i, iSize = dbrefs.length;
-
- for (i = 0; i < iSize; i++)
+ for (DBRefEntryI dbr : dbrefs)
{
- if (dbrefs[i].equalRef(entry))
+ if (dbr.updateFrom(entry))
{
- if (entry.getMap() != null)
- {
- if (dbrefs[i].getMap() == null)
- {
- // overwrite with 'superior' entry that contains a mapping.
- dbrefs[i] = entry;
- }
- }
+ /*
+ * found a dbref that either matched, or could be
+ * updated from, the new entry - no need to add it
+ */
return;
}
}
- DBRefEntry[] temp = new DBRefEntry[iSize + 1];
- System.arraycopy(dbrefs, 0, temp, 0, iSize);
+ /*
+ * extend the array to make room for one more
+ */
+ // TODO use an ArrayList instead
+ int j = dbrefs.length;
+ DBRefEntry[] temp = new DBRefEntry[j + 1];
+ System.arraycopy(dbrefs, 0, temp, 0, j);
temp[temp.length - 1] = entry;
dbrefs = temp;
+
+ DBRefUtils.ensurePrimaries(this);
}
+ @Override
public void setDatasetSequence(SequenceI seq)
{
+ if (seq == this)
+ {
+ throw new IllegalArgumentException(
+ "Implementation Error: self reference passed to SequenceI.setDatasetSequence");
+ }
+ if (seq != null && seq.getDatasetSequence() != null)
+ {
+ throw new IllegalArgumentException(
+ "Implementation error: cascading dataset sequences are not allowed.");
+ }
datasetSequence = seq;
}
+ @Override
public SequenceI getDatasetSequence()
{
return datasetSequence;
}
+ @Override
public AlignmentAnnotation[] getAnnotation()
{
- if (annotation == null)
- {
- return null;
- }
-
- AlignmentAnnotation[] ret = new AlignmentAnnotation[annotation.size()];
- for (int r = 0; r < ret.length; r++)
- {
- ret[r] = (AlignmentAnnotation) annotation.elementAt(r);
- }
+ return annotation == null ? null : annotation
+ .toArray(new AlignmentAnnotation[annotation.size()]);
+ }
- return ret;
+ @Override
+ public boolean hasAnnotation(AlignmentAnnotation ann)
+ {
+ return annotation == null ? false : annotation.contains(ann);
}
+ @Override
public void addAlignmentAnnotation(AlignmentAnnotation annotation)
{
if (this.annotation == null)
{
- this.annotation = new Vector();
+ this.annotation = new Vector();
}
if (!this.annotation.contains(annotation))
{
@@ -916,13 +1057,16 @@ public class Sequence implements SequenceI
annotation.setSequenceRef(this);
}
+ @Override
public void removeAlignmentAnnotation(AlignmentAnnotation annotation)
{
if (this.annotation != null)
{
this.annotation.removeElement(annotation);
if (this.annotation.size() == 0)
+ {
this.annotation = null;
+ }
}
}
@@ -946,71 +1090,90 @@ public class Sequence implements SequenceI
return true;
}
- /*
- * (non-Javadoc)
- *
- * @see jalview.datamodel.SequenceI#deriveSequence()
- */
+ @Override
public SequenceI deriveSequence()
{
- SequenceI seq = new Sequence(this);
- if (datasetSequence != null)
- {
- // duplicate current sequence with same dataset
- seq.setDatasetSequence(datasetSequence);
- }
- else
+ Sequence seq = null;
+ if (datasetSequence == null)
{
if (isValidDatasetSequence())
{
// Use this as dataset sequence
+ seq = new Sequence(getName(), "", 1, -1);
seq.setDatasetSequence(this);
+ seq.initSeqFrom(this, getAnnotation());
+ return seq;
}
else
{
// Create a new, valid dataset sequence
- SequenceI ds = seq;
- ds.setSequence(AlignSeq.extractGaps(
- jalview.util.Comparison.GapChars, new String(sequence)));
- setDatasetSequence(ds);
- ds.setSequenceFeatures(getSequenceFeatures());
- seq = this; // and return this sequence as the derived sequence.
+ createDatasetSequence();
}
}
- return seq;
+ return new Sequence(this);
}
+ private boolean _isNa;
+
+ private long _seqhash = 0;
+
+ /**
+ * Answers false if the sequence is more than 85% nucleotide (ACGTU), else
+ * true
+ */
+ @Override
+ public boolean isProtein()
+ {
+ if (datasetSequence != null)
+ {
+ return datasetSequence.isProtein();
+ }
+ if (_seqhash != sequence.hashCode())
+ {
+ _seqhash = sequence.hashCode();
+ _isNa = Comparison.isNucleotide(this);
+ }
+ return !_isNa;
+ };
+
/*
* (non-Javadoc)
*
* @see jalview.datamodel.SequenceI#createDatasetSequence()
*/
+ @Override
public SequenceI createDatasetSequence()
{
if (datasetSequence == null)
{
- datasetSequence = new Sequence(getName(), AlignSeq.extractGaps(
+ Sequence dsseq = new Sequence(getName(), AlignSeq.extractGaps(
jalview.util.Comparison.GapChars, getSequenceAsString()),
getStart(), getEnd());
- datasetSequence.setSequenceFeatures(getSequenceFeatures());
- datasetSequence.setDescription(getDescription());
- setSequenceFeatures(null);
- // move database references onto dataset sequence
- datasetSequence.setDBRef(getDBRef());
- setDBRef(null);
- datasetSequence.setPDBId(getPDBId());
- setPDBId(null);
+
+ datasetSequence = dsseq;
+
+ dsseq.setDescription(description);
+ // move features and database references onto dataset sequence
+ dsseq.sequenceFeatures = sequenceFeatures;
+ sequenceFeatures = null;
+ dsseq.dbrefs = dbrefs;
+ dbrefs = null;
+ // TODO: search and replace any references to this sequence with
+ // references to the dataset sequence in Mappings on dbref
+ dsseq.pdbIds = pdbIds;
+ pdbIds = null;
datasetSequence.updatePDBIds();
if (annotation != null)
{
- Vector _annot = annotation;
- annotation = null;
- for (AlignmentAnnotation aa : _annot)
+ // annotation is cloned rather than moved, to preserve what's currently
+ // on the alignment
+ for (AlignmentAnnotation aa : annotation)
{
- aa.sequenceRef = datasetSequence;
- aa.adjustForAlignment(); // uses annotation's own record of
- // sequence-column mapping
- datasetSequence.addAlignmentAnnotation(aa);
+ AlignmentAnnotation _aa = new AlignmentAnnotation(aa);
+ _aa.sequenceRef = datasetSequence;
+ _aa.adjustForAlignment(); // uses annotation's own record of
+ // sequence-column mapping
+ datasetSequence.addAlignmentAnnotation(_aa);
}
}
}
@@ -1024,6 +1187,7 @@ public class Sequence implements SequenceI
* jalview.datamodel.SequenceI#setAlignmentAnnotation(AlignmmentAnnotation[]
* annotations)
*/
+ @Override
public void setAlignmentAnnotation(AlignmentAnnotation[] annotations)
{
if (annotation != null)
@@ -1035,16 +1199,14 @@ public class Sequence implements SequenceI
for (int i = 0; i < annotations.length; i++)
{
if (annotations[i] != null)
+ {
addAlignmentAnnotation(annotations[i]);
+ }
}
}
}
- /*
- * (non-Javadoc)
- *
- * @see jalview.datamodel.SequenceI#getAnnotation(java.lang.String)
- */
+ @Override
public AlignmentAnnotation[] getAnnotation(String label)
{
if (annotation == null || annotation.size() == 0)
@@ -1077,6 +1239,7 @@ public class Sequence implements SequenceI
return anns;
}
+ @Override
public boolean updatePDBIds()
{
if (datasetSequence != null)
@@ -1088,55 +1251,25 @@ public class Sequence implements SequenceI
{
return false;
}
- Vector newpdb = new Vector();
- for (int i = 0; i < dbrefs.length; i++)
- {
- if (DBRefSource.PDB.equals(dbrefs[i].getSource()))
- {
- PDBEntry pdbe = new PDBEntry();
- pdbe.setId(dbrefs[i].getAccessionId());
- if (pdbIds == null || pdbIds.size() == 0)
- {
- newpdb.addElement(pdbe);
- }
- else
- {
- Enumeration en = pdbIds.elements();
- boolean matched = false;
- while (!matched && en.hasMoreElements())
- {
- PDBEntry anentry = (PDBEntry) en.nextElement();
- if (anentry.getId().equals(pdbe.getId()))
- {
- matched = true;
- }
- }
- if (!matched)
- {
- newpdb.addElement(pdbe);
- }
- }
- }
- }
- if (newpdb.size() > 0)
+ boolean added = false;
+ for (DBRefEntry dbr : dbrefs)
{
- Enumeration en = newpdb.elements();
- while (en.hasMoreElements())
+ if (DBRefSource.PDB.equals(dbr.getSource()))
{
- addPDBId((PDBEntry) en.nextElement());
+ /*
+ * 'Add' any PDB dbrefs as a PDBEntry - add is only performed if the
+ * PDB id is not already present in a 'matching' PDBEntry
+ * Constructor parses out a chain code if appended to the accession id
+ * (a fudge used to 'store' the chain code in the DBRef)
+ */
+ PDBEntry pdbe = new PDBEntry(dbr);
+ added |= addPDBId(pdbe);
}
- return true;
}
- return false;
+ return added;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * jalview.datamodel.SequenceI#transferAnnotation(jalview.datamodel.SequenceI,
- * jalview.datamodel.Mapping)
- */
+ @Override
public void transferAnnotation(SequenceI entry, Mapping mp)
{
if (datasetSequence != null)
@@ -1157,8 +1290,7 @@ public class Sequence implements SequenceI
for (int si = 0; si < sfs.length; si++)
{
SequenceFeature sf[] = (mp != null) ? mp.locateFeature(sfs[si])
- : new SequenceFeature[]
- { new SequenceFeature(sfs[si]) };
+ : new SequenceFeature[] { new SequenceFeature(sfs[si]) };
if (sf != null && sf.length > 0)
{
for (int sfi = 0; sfi < sf.length; sfi++)
@@ -1170,9 +1302,9 @@ public class Sequence implements SequenceI
}
// transfer PDB entries
- if (entry.getPDBId() != null)
+ if (entry.getAllPDBEntries() != null)
{
- Enumeration e = entry.getPDBId().elements();
+ Enumeration e = entry.getAllPDBEntries().elements();
while (e.hasMoreElements())
{
PDBEntry pdb = (PDBEntry) e.nextElement();
@@ -1180,7 +1312,7 @@ public class Sequence implements SequenceI
}
}
// transfer database references
- DBRefEntry[] entryRefs = entry.getDBRef();
+ DBRefEntry[] entryRefs = entry.getDBRefs();
if (entryRefs != null)
{
for (int r = 0; r < entryRefs.length; r++)
@@ -1204,6 +1336,7 @@ public class Sequence implements SequenceI
* @return The index (zero-based) on this sequence in the MSA. It returns
* {@code -1} if this information is not available.
*/
+ @Override
public int getIndex()
{
return index;
@@ -1217,13 +1350,129 @@ public class Sequence implements SequenceI
* position for this sequence. This value is zero-based (zero for
* this first sequence)
*/
+ @Override
public void setIndex(int value)
{
index = value;
}
-
- public void setRNA(RNA r){rna=r;}
-
- public RNA getRNA() { return rna; }
-
+
+ @Override
+ public void setRNA(RNA r)
+ {
+ rna = r;
+ }
+
+ @Override
+ public RNA getRNA()
+ {
+ return rna;
+ }
+
+ @Override
+ public List getAlignmentAnnotations(String calcId,
+ String label)
+ {
+ List result = new ArrayList();
+ if (this.annotation != null)
+ {
+ for (AlignmentAnnotation ann : annotation)
+ {
+ if (ann.calcId != null && ann.calcId.equals(calcId)
+ && ann.label != null && ann.label.equals(label))
+ {
+ result.add(ann);
+ }
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public String toString()
+ {
+ return getDisplayId(false);
+ }
+
+ @Override
+ public PDBEntry getPDBEntry(String pdbIdStr)
+ {
+ if (getDatasetSequence() != null)
+ {
+ return getDatasetSequence().getPDBEntry(pdbIdStr);
+ }
+ if (pdbIds == null)
+ {
+ return null;
+ }
+ List entries = getAllPDBEntries();
+ for (PDBEntry entry : entries)
+ {
+ if (entry.getId().equalsIgnoreCase(pdbIdStr))
+ {
+ return entry;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public List getPrimaryDBRefs()
+ {
+ if (datasetSequence != null)
+ {
+ return datasetSequence.getPrimaryDBRefs();
+ }
+ if (dbrefs == null || dbrefs.length == 0)
+ {
+ return Collections.emptyList();
+ }
+ synchronized (dbrefs)
+ {
+ List primaries = new ArrayList();
+ DBRefEntry[] tmp = new DBRefEntry[1];
+ for (DBRefEntry ref : dbrefs)
+ {
+ if (!ref.isPrimaryCandidate())
+ {
+ continue;
+ }
+ if (ref.hasMap())
+ {
+ MapList mp = ref.getMap().getMap();
+ if (mp.getFromLowest() > start || mp.getFromHighest() < end)
+ {
+ // map only involves a subsequence, so cannot be primary
+ continue;
+ }
+ }
+ // whilst it looks like it is a primary ref, we also sanity check type
+ if (DBRefUtils.getCanonicalName(DBRefSource.PDB).equals(
+ DBRefUtils.getCanonicalName(ref.getSource())))
+ {
+ // PDB dbrefs imply there should be a PDBEntry associated
+ // TODO: tighten PDB dbrefs
+ // formally imply Jalview has actually downloaded and
+ // parsed the pdb file. That means there should be a cached file
+ // handle on the PDBEntry, and a real mapping between sequence and
+ // extracted sequence from PDB file
+ PDBEntry pdbentry = getPDBEntry(ref.getAccessionId());
+ if (pdbentry != null && pdbentry.getFile() != null)
+ {
+ primaries.add(ref);
+ }
+ continue;
+ }
+ // check standard protein or dna sources
+ tmp[0] = ref;
+ DBRefEntry[] res = DBRefUtils.selectDbRefs(!isProtein(), tmp);
+ if (res != null && res[0] == tmp[0])
+ {
+ primaries.add(ref);
+ continue;
+ }
+ }
+ return primaries;
+ }
+ }
+
}