X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblGenome.java;h=20987e188ab2ffbe47bc9abb9ab466cf37de8791;hb=24fb77e77301499aa9e4e12d40d2ab42e06f56ca;hp=60f8c464a1d7d44b1306934137125e3201fe4ddc;hpb=ecc50d775a514f9840cdcc10a9d5b1e49c60582c;p=jalview.git

diff --git a/src/jalview/ext/ensembl/EnsemblGenome.java b/src/jalview/ext/ensembl/EnsemblGenome.java
index 60f8c46..20987e1 100644
--- a/src/jalview/ext/ensembl/EnsemblGenome.java
+++ b/src/jalview/ext/ensembl/EnsemblGenome.java
@@ -1,8 +1,15 @@
 package jalview.ext.ensembl;
 
 import jalview.datamodel.SequenceFeature;
-import jalview.io.gff.SequenceOntology;
 
+/**
+ * A client to fetch genomic sequence from Ensembl
+ * 
+ * TODO: not currently used - delete?
+ * 
+ * @author gmcarstairs
+ *
+ */
 public class EnsemblGenome extends EnsemblSeqProxy
 {
   /*
@@ -13,15 +20,28 @@ public class EnsemblGenome extends EnsemblSeqProxy
       EnsemblFeatureType.transcript, EnsemblFeatureType.exon,
       EnsemblFeatureType.cds, EnsemblFeatureType.variation };
 
+  /**
+   * Default constructor (to use rest.ensembl.org)
+   */
   public EnsemblGenome()
   {
     super();
   }
 
+  /**
+   * Constructor given the target domain to fetch data from
+   * 
+   * @param d
+   */
+  public EnsemblGenome(String d)
+  {
+    super(d);
+  }
+
   @Override
   public String getDbName()
   {
-    return "ENSEMBL (Genome)";
+    return "ENSEMBL (Genomic)";
   }
 
   @Override
@@ -38,15 +58,19 @@ public class EnsemblGenome extends EnsemblSeqProxy
 
   /**
    * Answers true unless the feature type is 'transcript' (or a sub-type of
-   * transcript in the Sequence Ontology). Transcript features are only
-   * retrieved in order to identify the transcript sequence range, and are
-   * redundant information on the transcript sequence itself.
+   * transcript in the Sequence Ontology), or has a parent other than the given
+   * accession id. Transcript features are only retrieved in order to identify
+   * the transcript sequence range, and are redundant information on the
+   * transcript sequence itself.
    */
   @Override
-  protected boolean retainFeature(String type)
+  protected boolean retainFeature(SequenceFeature sf, String accessionId)
   {
-    return !SequenceOntology.getInstance().isA(type,
-            SequenceOntology.TRANSCRIPT);
+    if (isTranscript(sf.getType()))
+    {
+      return false;
+    }
+    return featureMayBelong(sf, accessionId);
   }
 
   /**
@@ -57,8 +81,7 @@ public class EnsemblGenome extends EnsemblSeqProxy
   @Override
   protected boolean identifiesSequence(SequenceFeature sf, String accId)
   {
-    if (SequenceOntology.getInstance().isA(sf.getType(),
-            SequenceOntology.TRANSCRIPT))
+    if (isTranscript(sf.getType()))
     {
       String id = (String) sf.getValue(ID);
       if (("transcript:" + accId).equals(id))