JAL-2210 need to add both transcript and product, and Ensembl needs to be marked...

diff --git a/src/jalview/datamodel/DBRefSource.java b/src/jalview/datamodel/DBRefSource.java
index aef18e9..0ac14e5 100755 (executable)
--- a/src/jalview/datamodel/DBRefSource.java
+++ b/src/jalview/datamodel/DBRefSource.java
@@ -101,7 +101,7 @@ public class DBRefSource
   public static final String[] CODINGDBS = { EMBLCDS, GENEDB, ENSEMBL };
 
   public static final String[] PROTEINDBS = { UNIPROT, UNIPROTKB,
-      EMBLCDSProduct }; // , ENSEMBL }; // Ensembl ENSP* entries are protein
+      EMBLCDSProduct, ENSEMBL }; // Ensembl ENSP* entries are protein
 
   public static String[] allSources()
   {

diff --git a/src/jalview/ws/dbsources/Uniprot.java b/src/jalview/ws/dbsources/Uniprot.java
index e26ccda..4c53ef9 100644 (file)
--- a/src/jalview/ws/dbsources/Uniprot.java
+++ b/src/jalview/ws/dbsources/Uniprot.java
@@ -236,7 +236,7 @@ public class Uniprot extends DbSourceProxyImpl
           dbRefs.add(dbr);
         }
       }
-      if (false) // "Ensembl".equals(pdb.getType()))
+      if ("Ensembl".equals(pdb.getType()))
       {
         /*UniprotXML
          * <dbReference type="Ensembl" id="ENST00000321556">
@@ -249,8 +249,6 @@ public class Uniprot extends DbSourceProxyImpl
                 .get("protein sequence ID");
         if (cdsId != null && cdsId.trim().length() > 0)
         {
-          // Only add the product ID
-          dbRefs.remove(dbr);
           dbr = new DBRefEntry(DBRefSource.ENSEMBL, DBRefSource.UNIPROT
                   + ":" + dbVersion, cdsId.trim());
           dbRefs.add(dbr);