X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fio%2FJSONFileTest.java;h=a705a78c8b2d2ab36a635c36be04965fedf05f6a;hb=373586a0c940f2345179d1135738f245e29a98b8;hp=422e6d9693e1669b9769bd734d1edb9b2d51f75d;hpb=5f4e1e4c330b045e9c8bce28ee132a0fca3834d8;p=jalview.git diff --git a/test/jalview/io/JSONFileTest.java b/test/jalview/io/JSONFileTest.java index 422e6d9..a705a78 100644 --- a/test/jalview/io/JSONFileTest.java +++ b/test/jalview/io/JSONFileTest.java @@ -236,7 +236,7 @@ public class JSONFileTest try { alignment = (Alignment) formatAdapter.readFile(TEST_JSON_FILE, - AppletFormatAdapter.FILE, JSONFile.FILE_DESC); + DataSourceType.FILE, FileFormat.Json); jf = (JSONFile) formatAdapter.getAlignFile(); AlignFrame af = new AlignFrame(alignment, jf.getHiddenSequences(), @@ -250,12 +250,12 @@ public class JSONFileTest af.getViewport().setFeaturesDisplayed(jf.getDisplayedFeatures()); formatAdapter = new AppletFormatAdapter(af.alignPanel, exportSettings); - String jsonOutput = formatAdapter.formatSequences(JSONFile.FILE_DESC, + String jsonOutput = formatAdapter.formatSequences(FileFormat.Json, af.alignPanel.getAlignment(), false); formatAdapter = new AppletFormatAdapter(); testAlignment = formatAdapter.readFile(jsonOutput, - AppletFormatAdapter.PASTE, JSONFile.FILE_DESC); + DataSourceType.PASTE, FileFormat.Json); testJsonFile = (JSONFile) formatAdapter.getAlignFile(); // System.out.println(jsonOutput); } catch (IOException e)