private File selectedFile;
+ private static boolean useDefaultFileFormat = false;
+
/**
* default constructor always raised errors in GUI dialog boxes
*/
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")
// We read the data anyway - it might make sense.
}
// BH 2018 switch to File object here instead of filename
- alignFrame = new Jalview2XML(raiseGUI).loadJalviewAlign(
- selectedFile == null ? file : selectedFile);
+ alignFrame = new Jalview2XML(raiseGUI && !Jalview.isBatchMode())
+ .loadJalviewAlign(
+ selectedFile == null ? file : selectedFile);
}
else
{
"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()
{
} catch (Exception er)
{
- jalview.bin.Console.errPrintln("Exception whilst opening file '" + file);
+ jalview.bin.Console
+ .errPrintln("Exception whilst opening file '" + file);
er.printStackTrace();
- if (raiseGUI)
+ if (raiseGUI && !Jalview.isBatchMode())
{
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
er.printStackTrace();
alignFrame = null;
- if (raiseGUI)
+ if (raiseGUI && !Jalview.isBatchMode())
{
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
}
});
}
- jalview.bin.Console.errPrintln("Out of memory loading file " + file + "!!");
+ jalview.bin.Console
+ .errPrintln("Out of memory loading file " + file + "!!");
}
loadtime += System.currentTimeMillis();
}
this.setShouldBeSaved();
+ // after first file loaded we revert to assuming a default file format
+ useDefaultFileFormat = true;
}
/**
AlignViewport avp = af.getViewport();
if (avp == null)
return;
- avp.setSavedUpToDate(!protocol.isDynamic(),
- QuitHandler.Message.UNSAVED_ALIGNMENTS);
+ boolean upToDate = !protocol.isDynamic();
+ if (protocol.isUrl()
+ && Cache.getDefault(PROMPT_SAVE_UNCHANGED_URL_ALIGNMENTS, true))
+ {
+ upToDate = true;
+ }
+ avp.setSavedUpToDate(upToDate,
+ upToDate ? null : QuitHandler.Message.UNSAVED_ALIGNMENTS);
+ }
+
+ public static final String PROMPT_SAVE_UNCHANGED_URL_ALIGNMENTS = "PROMPT_SAVE_UNCHANGED_URL_ALIGNMENTS";
+
+ public static boolean getUseDefaultFileFormat()
+ {
+ return useDefaultFileFormat;
}
}