From: kiramt <k.mourao@dundee.ac.uk>
Date: Thu, 15 Jun 2017 10:54:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/develop' into bug/JAL-2591
X-Git-Tag: Release_2_10_3b1~183^2~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fbug%2FJAL-2591;p=jalview.git

Merge remote-tracking branch 'origin/develop' into bug/JAL-2591
---

54dd5d7c3c4384ef383ead7cf3d150ac5fddb3da
diff --cc src/jalview/appletgui/AnnotationColumnChooser.java
index 2557c8d,22978c3..3a7188e
--- a/src/jalview/appletgui/AnnotationColumnChooser.java
+++ b/src/jalview/appletgui/AnnotationColumnChooser.java
@@@ -306,10 -307,10 +306,11 @@@ public class AnnotationColumnChooser ex
              av.hideColumns(positions[0], positions[1]);
            }
          }
 +        // TODO not clear why we need to hide all the columns (above) if we are
 +        // going to copy the hidden columns over wholesale anyway
          av.getAlignment().setHiddenColumns(oldHidden);
        }
+       av.sendSelection();
        ap.paintAlignment(true);
      }
  
diff --cc src/jalview/gui/AnnotationColumnChooser.java
index bb475da,f81455e..6fc5fad
--- a/src/jalview/gui/AnnotationColumnChooser.java
+++ b/src/jalview/gui/AnnotationColumnChooser.java
@@@ -252,13 -253,12 +252,13 @@@ public class AnnotationColumnChooser ex
              av.hideColumns(positions[0], positions[1]);
            }
          }
 +        // TODO not clear why we need to hide all the columns (above) if we are
 +        // going to copy the hidden columns over wholesale anyway
          av.getAlignment().setHiddenColumns(oldHidden);
        }
+       av.sendSelection();
        ap.paintAlignment(true);
      }
- 
    }
  
    @Override