X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=971aba3374d3cabad422240afbc6f9f6f2d47a4f;hb=7fe4dbd0f30dd29c51daaf291d3710af7b1c88b9;hp=449c68577b21249f9f4d3ee763b61b3b9e5697b9;hpb=a7bc89415a6749ff89eb97f75fbc950a433a4935;p=jalview.git diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index 449c685..971aba3 100755 --- a/src/jalview/io/FileLoader.java +++ b/src/jalview/io/FileLoader.java @@ -96,32 +96,51 @@ public class FileLoader implements Runnable public void LoadFile(AlignViewport viewport, Object file, DataSourceType protocol, FileFormatI format) { + LoadFile(viewport, file, protocol, format, true); + } + + public void LoadFile(AlignViewport viewport, Object file, + DataSourceType protocol, FileFormatI format, boolean async) + { this.viewport = viewport; if (file instanceof File) { this.selectedFile = (File) file; file = selectedFile.getPath(); } - LoadFile(file.toString(), protocol, format); + LoadFile(file.toString(), protocol, format, async); } public void LoadFile(String file, DataSourceType protocol, FileFormatI format) { + LoadFile(file, protocol, format, true); + } + + public void LoadFile(String file, DataSourceType protocol, + FileFormatI format, boolean async) + { this.file = file; this.protocol = protocol; this.format = format; - final Thread loader = new Thread(this); - - SwingUtilities.invokeLater(new Runnable() + if (async) { - @Override - public void run() + final Thread loader = new Thread(this); + + SwingUtilities.invokeLater(new Runnable() { - loader.start(); - } - }); + @Override + public void run() + { + loader.start(); + } + }); + } + else + { + this.run(); + } } /**