X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;fp=src%2Fjalview%2Fio%2FFileLoader.java;h=dc7adac39496cd8dd761cb367e564019c6840bec;hp=bf79fa4c0c0c4fcc4e49db3663f672d18af6dee4;hb=00295142757dcaa892733bc104547e41f5078814;hpb=4fbf1d10221c2780c3ec9c8f9cc080ffae392c61 diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index bf79fa4..dc7adac 100755 --- a/src/jalview/io/FileLoader.java +++ b/src/jalview/io/FileLoader.java @@ -325,7 +325,7 @@ public class FileLoader implements Runnable Desktop.instance.stopLoading(); jalview.bin.Console.errPrintln("The input file \"" + file + "\" has null or unidentifiable data content!"); - if (!Jalview.isHeadlessMode()) + if (!Jalview.isHeadlessMode() && !Jalview.isBatchMode()) { JvOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager.getString("label.couldnt_read_data") @@ -361,7 +361,7 @@ public class FileLoader implements Runnable // We read the data anyway - it might make sense. } // BH 2018 switch to File object here instead of filename - alignFrame = new Jalview2XML(raiseGUI).loadJalviewAlign( + alignFrame = new Jalview2XML(raiseGUI && !Jalview.isBatchMode()).loadJalviewAlign( selectedFile == null ? file : selectedFile); } else @@ -537,7 +537,7 @@ public class FileLoader implements Runnable "label.couldnt_load_file") + " " + title + "\n" + error; // TODO: refactor FileLoader to be independent of Desktop / Applet GUI // bits ? - if (raiseGUI && Desktop.desktop != null) + if (raiseGUI && !Jalview.isBatchMode() && Desktop.desktop != null) { javax.swing.SwingUtilities.invokeLater(new Runnable() { @@ -565,7 +565,7 @@ public class FileLoader implements Runnable { jalview.bin.Console.errPrintln("Exception whilst opening file '" + file); er.printStackTrace(); - if (raiseGUI) + if (raiseGUI && !Jalview.isBatchMode()) { javax.swing.SwingUtilities.invokeLater(new Runnable() { @@ -587,7 +587,7 @@ public class FileLoader implements Runnable er.printStackTrace(); alignFrame = null; - if (raiseGUI) + if (raiseGUI && !Jalview.isBatchMode()) { javax.swing.SwingUtilities.invokeLater(new Runnable() {