import jalview.gui.AlignViewport;
import jalview.gui.Desktop;
import jalview.gui.JvOptionPane;
+import jalview.gui.QuitHandler;
import jalview.json.binding.biojson.v1.ColourSchemeMapper;
import jalview.project.Jalview2XML;
import jalview.schemes.ColourSchemeI;
private File selectedFile;
+ private static boolean useDefaultFileFormat = false;
+
/**
* default constructor always raised errors in GUI dialog boxes
*/
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();
+ }
}
/**
MessageManager.getString("label.couldnt_read_data"),
JvOptionPane.WARNING_MESSAGE);
}
+ // don't set shouldBeSaved if didn't load anything
+ // this.setShouldBeSaved();
return;
}
// TODO: cache any stream datasources as a temporary file (eg. PDBs
// that perform queries to find the 'current working alignment'
Desktop.addInternalFrame(alignFrame, title,
AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT);
+
+ /*
+ * for an Overview automatically opened with alignment,
+ * set its title now alignFrame title has been set
+ */
+ alignFrame.alignPanel.setOverviewTitle(alignFrame);
}
try
Desktop.instance.stopLoading();
}
+ this.setShouldBeSaved();
+ // after first file loaded we revert to assuming a default file format
+ useDefaultFileFormat = true;
}
/**
return tempStructFile.toString();
}
+ /*
+ * set whether quit should ask to save when just loaded this source
+ */
+ private void setShouldBeSaved()
+ {
+ if (protocol == null)
+ return;
+ AlignFrame af = this.alignFrame;
+ if (af == null)
+ return;
+ AlignViewport avp = af.getViewport();
+ if (avp == null)
+ return;
+ avp.setSavedUpToDate(!protocol.isDynamic(),
+ QuitHandler.Message.UNSAVED_ALIGNMENTS);
+ }
+
+ public static boolean getUseDefaultFileFormat()
+ {
+ return useDefaultFileFormat;
+ }
+
}