JAL-2349 don’t clobber existing label/description for an annotation when associating...

diff --git a/src/jalview/datamodel/ContactMapHolder.java b/src/jalview/datamodel/ContactMapHolder.java
index a555a17..296feaf 100644 (file)
--- a/src/jalview/datamodel/ContactMapHolder.java
+++ b/src/jalview/datamodel/ContactMapHolder.java
@@ -72,8 +72,15 @@ public class ContactMapHolder implements ContactMapHolderI
     annotation.editable = false;
     annotation.graph = AlignmentAnnotation.CONTACT_MAP;
     annotation.calcId = cm.getType();
-    annotation.label = cm.getAnnotLabel();
-    annotation.description = cm.getAnnotDescr();
+    if (annotation.label == null || "".equals(annotation.label))
+    {
+      annotation.label = cm.getAnnotLabel();
+
+    }
+    if (annotation.description == null || "".equals(annotation.description))
+    {
+      annotation.description = cm.getAnnotDescr();
+    }
     contactmaps.put(annotation.annotationId, cm);
   }
 }