JAL-2920 don’t output variant/original sequence as three-letter codes for more than...

[jalview.git] / src / jalview / ws / dbsources / Uniprot.java

diff --git a/src/jalview/ws/dbsources/Uniprot.java b/src/jalview/ws/dbsources/Uniprot.java
index fc4f318..d44b104 100644 (file)
--- a/src/jalview/ws/dbsources/Uniprot.java
+++ b/src/jalview/ws/dbsources/Uniprot.java
@@ -316,21 +316,46 @@ public class Uniprot extends DbSourceProxyImpl
       int p = 0;
       for (String var : variants)
       {
+        // TODO proper HGVC nomenclature for delins structural variations
+        // for now we are pragmatic - any orig/variant sequence longer than
+        // three characters is shown with single-character notation rather than
+        // three-letter notation
         sb.append("p.");
-        String orig3 = ResidueProperties.aa2Triplet.get(orig);
-        sb.append(orig3 == null ? orig : StringUtils.toSentenceCase(orig3));
-        sb.append(Integer.toString(uf.getPosition()));
-        for (int c = 0, clen = var.length(); c < clen; c++)
+        if (orig.length() < 4)
+        {
+          for (int c = 0, clen = orig.length(); c < clen; c++)
+          {
+            char origchar = orig.charAt(c);
+            String orig3 = ResidueProperties.aa2Triplet.get("" + origchar);
+            sb.append(orig3 == null ? origchar
+                    : StringUtils.toSentenceCase(orig3));
+          }
+        }
+        else
         {
-          char varchar = var.charAt(c);
-          String var3 = ResidueProperties.aa2Triplet.get("" + varchar);
+          sb.append(orig);
+        }
 
-          sb.append(var3 != null ? StringUtils.toSentenceCase(var3)
-                  : "" + varchar);
+        sb.append(Integer.toString(uf.getPosition()));
+
+        if (var.length() < 4)
+        {
+          for (int c = 0, clen = var.length(); c < clen; c++)
+          {
+            char varchar = var.charAt(c);
+            String var3 = ResidueProperties.aa2Triplet.get("" + varchar);
+
+            sb.append(var3 != null ? StringUtils.toSentenceCase(var3)
+                    : "" + varchar);
+          }
+        }
+        else
+        {
+          sb.append(var);
         }
         if (++p != variants.size())
         {
-          sb.append("<br/>");
+          sb.append("\n");
         }
         else
         {