JAL-2920 simplified logic and added corner cases for missing attributes (probably...

diff --git a/src/jalview/datamodel/xdb/uniprot/UniprotFeature.java b/src/jalview/datamodel/xdb/uniprot/UniprotFeature.java
index 6102775..4c2ae24 100644 (file)
--- a/src/jalview/datamodel/xdb/uniprot/UniprotFeature.java
+++ b/src/jalview/datamodel/xdb/uniprot/UniprotFeature.java
@@ -51,13 +51,19 @@ public class UniprotFeature
 
   public String getDescription()
   {
-    return (description == null && variation == null && original == null)
-            ? null
-            : (description == null ? "" : description)
-                    + ((variation != null)
-                            ? "Variation: '" + variation + "' "
+    if (description == null && variation == null && original == null)
+    {
+      return null;
+    }
+    return (description == null ? "" : description)
+            + (variation != null
+                    ? (description != null ? " " : "") + "Variation: '"
+                            + variation + "'"
                     : "")
-            + ((original != null) ? "Original: '" + original + "'" : "");
+            + (original != null
+                    ? ((description != null || variation != null) ? " "
+                            : "") + "Original: '" + original + "'"
+                    : "");
   }
 
   public void setDescription(String d)