From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 2 Jun 2017 16:11:15 +0000 (+0100)
Subject: Merge branch 'bug/JAL-2578' into develop
X-Git-Tag: Release_2_10_2~3^2~41
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1e11a9618abb5da87fb2e13917f20a0df374af42;p=jalview.git

Merge branch 'bug/JAL-2578' into develop
---

1e11a9618abb5da87fb2e13917f20a0df374af42
diff --cc src/jalview/gui/AnnotationColumnChooser.java
index a15f605,7dafa7d..9c2a1b9
--- a/src/jalview/gui/AnnotationColumnChooser.java
+++ b/src/jalview/gui/AnnotationColumnChooser.java
@@@ -384,8 -387,17 +384,12 @@@ public class AnnotationColumnChooser ex
                    .addRegexSearchField(AnnotationFilterParameter.SearchableAnnotationField.DESCRIPTION);
          }
        }
 -      else
 -      {
 -        currentSearchPanel.description.setEnabled(false);
 -        currentSearchPanel.displayName.setEnabled(false);
 -      }
      }
  
+     // show hidden columns here, before changing the column selection in
+     // filterAnnotations, because showing hidden columns has the side effect of
+     // adding them to the selection
+     av.showAllHiddenColumns();
      av.getColumnSelection().filterAnnotations(
              getCurrentAnnotation().annotations, filterParams);