From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 29 Sep 2016 10:58:55 +0000 (+0100)
Subject: Merge branch 'patch/JAL-2236_filtercolumns_seqassoc' into develop
X-Git-Tag: Release_2_10_0~30^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=33ad2b9a53a0e7faec7afddf91de829d98df07bc;hp=fecb7871ff2ec644c4f3c9ea513df7c0fce30514;p=jalview.git

Merge branch 'patch/JAL-2236_filtercolumns_seqassoc' into develop
---

diff --git a/src/jalview/appletgui/AnnotationRowFilter.java b/src/jalview/appletgui/AnnotationRowFilter.java
index fc49de5..cd00fcf 100644
--- a/src/jalview/appletgui/AnnotationRowFilter.java
+++ b/src/jalview/appletgui/AnnotationRowFilter.java
@@ -104,6 +104,16 @@ public abstract class AnnotationRowFilter extends Panel
         enableSeqAss = true;
       }
       String label = av.getAlignment().getAlignmentAnnotation()[i].label;
+      // add associated sequence ID if available
+      if (!isSeqAssociated
+              && av.getAlignment().getAlignmentAnnotation()[i].sequenceRef != null)
+      {
+        label = label
+                + "_"
+                + av.getAlignment().getAlignmentAnnotation()[i].sequenceRef
+                        .getName();
+      }
+      // make label unique
       if (!list.contains(label))
       {
         anmap[list.size()] = i;
diff --git a/src/jalview/gui/AnnotationRowFilter.java b/src/jalview/gui/AnnotationRowFilter.java
index f0bea60..0a5e96c 100644
--- a/src/jalview/gui/AnnotationRowFilter.java
+++ b/src/jalview/gui/AnnotationRowFilter.java
@@ -161,6 +161,16 @@ public abstract class AnnotationRowFilter extends JPanel
         enableSeqAss = true;
       }
       String label = av.getAlignment().getAlignmentAnnotation()[i].label;
+      // add associated sequence ID if available
+      if (!isSeqAssociated
+              && av.getAlignment().getAlignmentAnnotation()[i].sequenceRef != null)
+      {
+        label = label
+                + "_"
+                + av.getAlignment().getAlignmentAnnotation()[i].sequenceRef
+                        .getName();
+      }
+      // make label unique
       if (!list.contains(label))
       {
         anmap[list.size()] = i;