JAL-2885 ENSEMBL-DOMAIN -> ENSEMBL-BASEURL

[jalview.git] / src / jalview / datamodel / AlignmentAnnotation.java

diff --git a/src/jalview/datamodel/AlignmentAnnotation.java b/src/jalview/datamodel/AlignmentAnnotation.java
index ffc3105..f7bf4d8 100755 (executable)
--- a/src/jalview/datamodel/AlignmentAnnotation.java
+++ b/src/jalview/datamodel/AlignmentAnnotation.java
@@ -1530,7 +1530,9 @@ public class AlignmentAnnotation
     }
     for (AlignmentAnnotation a : list)
     {
-      if (calcId.equals(a.getCalcId()))
+
+      if (a.getCalcId() == calcId || (a.getCalcId() != null
+              && calcId != null && a.getCalcId().equals(calcId)))
       {
         aa.add(a);
       }