From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 13 Nov 2017 18:59:59 +0000 (+0000)
Subject: Merge branch 'features/JAL-2758_shorteruniprot' into develop
X-Git-Tag: Release_2_10_3b1~35
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=141abbd1a196f26a643318ed9677d0225c568402;hp=6dc86748c90f09948e6a6850e2542e55c0464683;p=jalview.git

Merge branch 'features/JAL-2758_shorteruniprot' into develop
---

diff --git a/src/jalview/ws/dbsources/Uniprot.java b/src/jalview/ws/dbsources/Uniprot.java
index c9beb8e..73775cf 100644
--- a/src/jalview/ws/dbsources/Uniprot.java
+++ b/src/jalview/ws/dbsources/Uniprot.java
@@ -310,23 +310,18 @@ public class Uniprot extends DbSourceProxyImpl
   /**
    *
    * @param entry
-   *          UniportEntry
+   *          UniprotEntry
    * @return The accession id(s) and name(s) delimited by '|'.
    */
   public static String getUniprotEntryId(UniprotEntry entry)
   {
     StringBuilder name = new StringBuilder(32);
-    // name.append("UniProt/Swiss-Prot");
-    // use 'canonicalised' name for optimal id matching
-    name.append(DBRefSource.UNIPROT);
-    for (String accessionId : entry.getAccession())
-    {
-      name.append(BAR_DELIMITER);
-      name.append(accessionId);
-    }
     for (String n : entry.getName())
     {
-      name.append(BAR_DELIMITER);
+      if (name.length() > 0)
+      {
+        name.append(BAR_DELIMITER);
+      }
       name.append(n);
     }
     return name.toString();
diff --git a/test/jalview/ws/dbsources/UniprotTest.java b/test/jalview/ws/dbsources/UniprotTest.java
index 2d4be71..5421a44 100644
--- a/test/jalview/ws/dbsources/UniprotTest.java
+++ b/test/jalview/ws/dbsources/UniprotTest.java
@@ -167,7 +167,10 @@ public class UniprotTest
      * source database converted to Jalview canonical name
      */
     String expectedName = "UNIPROT|A9CKP4|A9CKP5|A9CKP4_AGRT5|A9CKP4_AGRT6";
-    assertEquals(expectedName, Uniprot.getUniprotEntryId(entry));
+    assertEquals(expectedName, Uniprot.getUniprotEntryId(entry, true));
+    String expectedShortName = "A9CKP4_AGRT5|A9CKP4_AGRT6";
+    assertEquals(expectedShortName,
+            Uniprot.getUniprotEntryId(entry, false));
   }
 
   /**