X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fio%2FJSONFileTest.java;h=cd40babf2dffd302354155d56d7c1f4698cbef4a;hb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;hp=93fb12b6b41fc96d5c4fb76ef93360b9d2b380ae;hpb=0bec4854366c4bc4608ed0d7dc1506fc6afe2285;p=jalview.git diff --git a/test/jalview/io/JSONFileTest.java b/test/jalview/io/JSONFileTest.java index 93fb12b..cd40bab 100644 --- a/test/jalview/io/JSONFileTest.java +++ b/test/jalview/io/JSONFileTest.java @@ -227,7 +227,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(), @@ -241,12 +241,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)