X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=67c72c224d1fa05213375865372f336c44042540;hb=4f24ef0848cf3c43ba0467f31fce1baa5c57aad5;hp=f7208045907cab2aef42c267128806d350d767bb;hpb=e44514b727077d5cd7edb5d8184ab85cbc2eed13;p=jalview.git diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index f720804..67c72c2 100755 --- a/src/jalview/io/FileLoader.java +++ b/src/jalview/io/FileLoader.java @@ -122,8 +122,11 @@ public class FileLoader AlignFrame af; + public void run() { + Desktop.instance.startLoading(file); + SequenceI[] sequences = null; if (format.equalsIgnoreCase("Jalview")) @@ -164,11 +167,6 @@ public class FileLoader Desktop.addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT); - if(jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false)) - { - af.wrapMenuItem.setSelected(true); - af.wrapMenuItem_actionPerformed(null); - } try { af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false)); @@ -181,6 +179,8 @@ public class FileLoader } else { + Desktop.instance.stopLoading(); + JOptionPane.showInternalMessageDialog(Desktop.desktop, "Couldn't load file " + file + "\n" @@ -194,6 +194,9 @@ public class FileLoader { updateRecentlyOpened(); } + + Desktop.instance.stopLoading(); + } }