JAL-2835 spike updated with latest

[jalview.git] / src / jalview / io / SequenceAnnotationReport.java

diff --git a/src/jalview/io/SequenceAnnotationReport.java b/src/jalview/io/SequenceAnnotationReport.java
index 1f92428..6b82671 100644 (file)
--- a/src/jalview/io/SequenceAnnotationReport.java
+++ b/src/jalview/io/SequenceAnnotationReport.java
@@ -210,11 +210,12 @@ public class SequenceAnnotationReport
         FeatureColourI fc = fr.getFeatureColours().get(feature.getType());
         if (fc != null && fc.isColourByAttribute())
         {
-          String attName = fc.getAttributeName();
+          String[] attName = fc.getAttributeName();
           String attVal = feature.getValueAsString(attName);
           if (attVal != null)
           {
-            sb.append("; ").append(attName).append("=").append(attVal);
+            sb.append("; ").append(String.join(":", attName)).append("=")
+                    .append(attVal);
           }
         }
       }
@@ -301,7 +302,7 @@ public class SequenceAnnotationReport
    */
   Collection<List<String>> createLinksFrom(SequenceI seq, String link)
   {
-    Map<String, List<String>> urlSets = new LinkedHashMap<String, List<String>>();
+    Map<String, List<String>> urlSets = new LinkedHashMap<>();
     UrlLink urlLink = new UrlLink(link);
     if (!urlLink.isValid())
     {