import jalview.bin.Cache;
import jalview.bin.Jalview;
import jalview.gui.ImageExporter.ImageWriterI;
+import jalview.gui.QuitHandler.QResponse;
import jalview.io.BackupFiles;
import jalview.io.DataSourceType;
import jalview.io.FileFormat;
import jalview.io.JalviewFileView;
import jalview.jbgui.GSplitFrame;
import jalview.jbgui.GStructureViewer;
-import jalview.jbgui.QuitHandler;
-import jalview.jbgui.QuitHandler.QResponse;
import jalview.project.Jalview2XML;
import jalview.structure.StructureSelectionManager;
import jalview.urls.IdOrgSettings;
public static HashMap<String, FileWriter> savingFiles = new HashMap<String, FileWriter>();
+ private static int DRAG_MODE = JDesktopPane.OUTLINE_DRAG_MODE;
+
+ public static void setLiveDragMode(boolean b)
+ {
+ DRAG_MODE = b ? JDesktopPane.LIVE_DRAG_MODE
+ : JDesktopPane.OUTLINE_DRAG_MODE;
+ if (desktop != null)
+ desktop.setDragMode(DRAG_MODE);
+ }
+
private JalviewChangeSupport changeSupport = new JalviewChangeSupport();
public static boolean nosplash = false;
}
getContentPane().add(desktop, BorderLayout.CENTER);
- desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
+ desktop.setDragMode(DRAG_MODE);
// This line prevents Windows Look&Feel resizing all new windows to maximum
// if previous window was maximised
public QuitHandler.QResponse desktopQuit(boolean ui, boolean disposeFlag)
{
- final Callable<QuitHandler.QResponse> doDesktopQuit = () -> {
+ final Callable<Void> doDesktopQuit = () -> {
Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
Cache.setProperty("SCREENGEOMETRY_WIDTH", screen.width + "");
Cache.setProperty("SCREENGEOMETRY_HEIGHT", screen.height + "");
if (jvnews != null)
{
storeLastKnownDimensions("JALVIEW_RSS_WINDOW_", jvnews.getBounds());
+ }
+
+ closeAll_actionPerformed(null);
+ // check for aborted quit
+ if (QuitHandler.quitCancelled())
+ {
+ jalview.bin.Console.debug("Desktop aborting quit");
+ return null;
}
if (dialogExecutor != null)
dialogExecutor.shutdownNow();
}
- closeAll_actionPerformed(null);
-
if (groovyConsole != null)
{
// suppress a possible repeat prompt to save script
instance.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
// instance.dispose();
}
- jalview.bin.Console.debug("**** BEFORE quit");
- jalview.bin.Console.debug("**** QuitHandler.gotQuitResponse="
- + QuitHandler.gotQuitResponse());
instance.quit();
- jalview.bin.Console.debug("**** AFTER quit");
- return QuitHandler.gotQuitResponse();
+ return null; // Void
};
return QuitHandler.getQuitResponse(ui, doDesktopQuit, doDesktopQuit,
{
// TODO show a progress bar while closing?
JInternalFrame[] frames = desktop.getAllFrames();
+ boolean quitting = QuitHandler.quitting();
for (int i = 0; i < frames.length; i++)
{
try
{
frames[i].setClosed(true);
+ // check for cancelled quit
+ if (quitting && QuitHandler.quitCancelled())
+ {
+ return;
+ }
} catch (java.beans.PropertyVetoException ex)
{
}
saveState_actionPerformed(true);
}
- private void setProjectFile(File choice)
+ protected void setProjectFile(File choice)
{
this.projectFile = choice;
}
/**
* single thread that handles display of dialogs to user.
*/
- ExecutorService dialogExecutor = Executors.newSingleThreadExecutor();
+ ExecutorService dialogExecutor = Executors.newFixedThreadPool(3);
/**
* flag indicating if dialogExecutor should try to acquire a permit