X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblCdna.java;h=e01ad17eaee377a850713e5af6e8fd47582859f1;hb=d2f616a89def59116b4a4f8d80251138d2c1da3d;hp=952f01e9fb57cbfddd4f0b2ac46fbdc090fa6dfe;hpb=17ff1f476e009b3a3c7e892e416edc2a4af8a2bc;p=jalview.git diff --git a/src/jalview/ext/ensembl/EnsemblCdna.java b/src/jalview/ext/ensembl/EnsemblCdna.java index 952f01e..e01ad17 100644 --- a/src/jalview/ext/ensembl/EnsemblCdna.java +++ b/src/jalview/ext/ensembl/EnsemblCdna.java @@ -21,9 +21,12 @@ package jalview.ext.ensembl; import jalview.datamodel.SequenceFeature; -import jalview.io.gff.SequenceOntologyFactory; +import jalview.datamodel.SequenceI; import jalview.io.gff.SequenceOntologyI; +import java.util.ArrayList; +import java.util.List; + import com.stevesoft.pat.Regex; /** @@ -109,23 +112,27 @@ public class EnsemblCdna extends EnsemblSeqProxy } /** - * Answers true if the sequence feature type is 'exon' (or a subtype of exon - * in the Sequence Ontology), and the Parent of the feature is the transcript - * we are retrieving + * Answers a list of sequence features (if any) whose type is 'exon' (or a + * subtype of exon in the Sequence Ontology), and whose Parent is the + * transcript we are retrieving */ @Override - protected boolean identifiesSequence(SequenceFeature sf, String accId) + protected List getIdentifyingFeatures(SequenceI seq, + String accId) { - if (SequenceOntologyFactory.getInstance().isA(sf.getType(), - SequenceOntologyI.EXON)) + List result = new ArrayList<>(); + List sfs = seq.getFeatures() + .getFeaturesByOntology(SequenceOntologyI.EXON); + for (SequenceFeature sf : sfs) { String parentFeature = (String) sf.getValue(PARENT); - if (("transcript:" + accId).equals(parentFeature)) + if (accId.equals(parentFeature)) { - return true; + result.add(sf); } } - return false; + + return result; } /**