Merge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 26 Apr 2017 13:36:03 +0000 (14:36 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 26 Apr 2017 13:36:03 +0000 (14:36 +0100)
1  2 
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/io/JSONFile.java
test/jalview/io/JSONFileTest.java

Simple merge
@@@ -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()