From: kiramt <k.mourao@dundee.ac.uk>
Date: Wed, 26 Apr 2017 13:36:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow
X-Git-Tag: Release_2_10_2~3^2~92^2~5
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=bd2190024b6988cc7a371e932ef5c46de0d9df3b;p=jalview.git

Merge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow
---

bd2190024b6988cc7a371e932ef5c46de0d9df3b
diff --cc test/jalview/io/JSONFileTest.java
index 1917097,4e4abe9..1081223
--- a/test/jalview/io/JSONFileTest.java
+++ b/test/jalview/io/JSONFileTest.java
@@@ -191,9 -194,9 +194,9 @@@ public class JSONFileTes
      TEST_SEQ_HEIGHT = expectedSeqs.size();
      TEST_GRP_HEIGHT = expectedGrps.size();
      TEST_ANOT_HEIGHT = expectedAnnots.size();
 -    TEST_CS_HEIGHT = expectedColSel.getHiddenColumns().size();
 +    TEST_CS_HEIGHT = expectedColSel.getHiddenRegions().size();
  
-     AlignExportSettingI exportSettings = new AlignExportSettingI()
+     exportSettings = new AlignExportSettingI()
      {
        @Override
        public boolean isExportHiddenSequences()