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

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

14dfbaf6a266c6d5789f1f113b63a33a435ea0b2
diff --cc test/jalview/io/JSONFileTest.java
index 957343b,4e4abe9..81d0ef7
--- 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.getListOfCols().size();
  
-     AlignExportSettingI exportSettings = new AlignExportSettingI()
+     exportSettings = new AlignExportSettingI()
      {
        @Override
        public boolean isExportHiddenSequences()