X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FUniprot.java;h=65141f88056045010a52df5ecebfb9bacb541227;hb=a8d30fa38a5d3e9cccf08aa446ca8ab00469bfd4;hp=8e7893fe2907a3cbc7305f771b3b3cc5d0726bf1;hpb=5c7ef5c5b65be30aebbc132324cef8e9e5b783c6;p=jalview.git

diff --git a/src/jalview/ws/dbsources/Uniprot.java b/src/jalview/ws/dbsources/Uniprot.java
index 8e7893f..65141f8 100644
--- a/src/jalview/ws/dbsources/Uniprot.java
+++ b/src/jalview/ws/dbsources/Uniprot.java
@@ -149,9 +149,12 @@ public class Uniprot extends DbSourceProxyImpl implements DbSourceProxy
             name.append(en2.nextElement());
           }
 
-          if (entry.getProtein() != null)
+          if (entry.getProtein()!=null && entry.getProtein().getName()!=null)
           {
-            name.append(" " + entry.getProtein().getName().elementAt(0));
+              for (int nm=0,nmSize=entry.getProtein().getName().size(); nm<nmSize;nm++)
+              {
+                name.append(" " + entry.getProtein().getName().elementAt(nm));
+              }
           }
 
           result.append(name + "\n"
@@ -193,11 +196,17 @@ public class Uniprot extends DbSourceProxyImpl implements DbSourceProxy
       UniprotEntry entry = (UniprotEntry) entries.elementAt(i);
       Enumeration e = entry.getDbReference().elements();
       Vector onlyPdbEntries = new Vector();
+      Vector dbxrefs = new Vector();
       while (e.hasMoreElements())
       {
         PDBEntry pdb = (PDBEntry) e.nextElement();
         if (!pdb.getType().equals("PDB"))
         {
+          DBRefEntry dbr = new DBRefEntry();
+          dbr.setSource(pdb.getType());
+          dbr.setAccessionId(pdb.getId());
+          dbr.setVersion(DBRefSource.UNIPROT+":"+getDbVersion());
+          dbxrefs.addElement(dbr);
           continue;
         }
 
@@ -217,6 +226,13 @@ public class Uniprot extends DbSourceProxyImpl implements DbSourceProxy
                 new DBRefEntry(DBRefSource.UNIPROT, getDbVersion(), en2.nextElement()
                         .toString()));
       }
+      en2 = dbxrefs.elements();
+      while (en2.hasMoreElements())
+      {
+     // we always add as uniprot if we retrieved from uniprot or uniprot name
+        sq.addDBRef((DBRefEntry) en2.nextElement());
+                    
+      }
       sq.setPDBId(onlyPdbEntries);
       if (entry.getFeature() != null)
       {
@@ -249,6 +265,6 @@ public class Uniprot extends DbSourceProxyImpl implements DbSourceProxy
   }
   public String getDbName()
   {
-    return getDbSource();
+    return "Uniprot"; // getDbSource();
   }
 }