import java.io.File;
import java.util.List;
-import java.util.concurrent.Callable;
+import java.util.Locale;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import javax.swing.JTextPane;
import com.formdev.flatlaf.extras.FlatDesktop;
+import com.formdev.flatlaf.extras.FlatDesktop.QuitResponse;
import jalview.api.AlignmentViewPanel;
import jalview.bin.Cache;
private static boolean interactive = true;
+ private static QuitResponse flatlafResponse = null;
+
public static enum QResponse
{
NULL, QUIT, CANCEL_QUIT, FORCE_QUIT
private static ExecutorService executor = Executors.newFixedThreadPool(3);
- public static QResponse setQuitHandler()
+ public static void setQuitHandler()
{
FlatDesktop.setQuitHandler(response -> {
- Callable<Void> performQuit = () -> {
- response.performQuit();
- setResponse(QResponse.QUIT);
- return null;
- };
- Callable<Void> performForceQuit = () -> {
- response.performQuit();
- setResponse(QResponse.FORCE_QUIT);
- return null;
- };
- Callable<Void> cancelQuit = () -> {
- response.cancelQuit();
- // reset
- setResponse(QResponse.NULL);
- return null;
- };
- getQuitResponse(true, performQuit, performForceQuit, cancelQuit);
+ flatlafResponse = response;
+ Desktop.instance.desktopQuit();
});
+ }
- return gotQuitResponse();
+ public static void startForceQuit()
+ {
+ setResponse(QResponse.FORCE_QUIT);
}
private static QResponse gotQuitResponse = QResponse.NULL;
protected static QResponse setResponse(QResponse qresponse)
{
gotQuitResponse = qresponse;
+ if ((qresponse == QResponse.CANCEL_QUIT || qresponse == QResponse.NULL)
+ && flatlafResponse != null)
+ {
+ flatlafResponse.cancelQuit();
+ }
return qresponse;
}
return gotQuitResponse;
}
- public static final Callable<Void> defaultCancelQuit = () -> {
+ public static final Runnable defaultCancelQuit = () -> {
Console.debug("QuitHandler: (default) Quit action CANCELLED by user");
// reset
setResponse(QResponse.CANCEL_QUIT);
- return null;
};
- public static final Callable<Void> defaultOkQuit = () -> {
+ public static final Runnable defaultOkQuit = () -> {
Console.debug("QuitHandler: (default) Quit action CONFIRMED by user");
setResponse(QResponse.QUIT);
- return null;
};
- public static final Callable<Void> defaultForceQuit = () -> {
+ public static final Runnable defaultForceQuit = () -> {
Console.debug("QuitHandler: (default) Quit action FORCED by user");
// note that shutdown hook will not be run
Runtime.getRuntime().halt(0);
setResponse(QResponse.FORCE_QUIT); // this line never reached!
- return null;
};
public static QResponse getQuitResponse(boolean ui)
defaultCancelQuit);
}
- public static QResponse getQuitResponse(boolean ui, Callable<Void> okQuit,
- Callable<Void> forceQuit, Callable<Void> cancelQuit)
+ public static QResponse getQuitResponse(boolean ui, Runnable okQuit,
+ Runnable forceQuit, Runnable cancelQuit)
{
QResponse got = gotQuitResponse();
if (got != QResponse.NULL && got != QResponse.CANCEL_QUIT)
qd.showDialogOnTopAsync(
new StringBuilder(
MessageManager.getString("label.quit_jalview"))
- .append("\n").append(messageString)
- .toString(),
+ .append("\n").append(messageString).toString(),
MessageManager.getString("action.quit"),
JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null,
new Object[]
int count = Desktop.instance.structureViewersStillRunningCount();
if (count > 0)
{
+ String alwaysCloseExternalViewers = Cache
+ .getDefault("ALWAYS_CLOSE_EXTERNAL_VIEWERS", "ask");
String prompt = MessageManager
.formatMessage(count == 1 ? "label.confirm_quit_viewer"
: "label.confirm_quit_viewers");
String[] buttonsText = { MessageManager.getString("action.yes"),
MessageManager.getString("action.no"), cancelQuitText };
- int confirmResponse = JvOptionPane.showOptionDialog(
- Desktop.instance, prompt, title,
- JvOptionPane.YES_NO_CANCEL_OPTION,
- JvOptionPane.WARNING_MESSAGE, null, buttonsText,
- cancelQuit);
+ int confirmResponse = -1;
+ if (alwaysCloseExternalViewers == null || "ask".equals(
+ alwaysCloseExternalViewers.toLowerCase(Locale.ROOT)))
+ {
+ confirmResponse = JvOptionPane.showOptionDialog(Desktop.instance,
+ prompt, title, JvOptionPane.YES_NO_CANCEL_OPTION,
+ JvOptionPane.WARNING_MESSAGE, null, buttonsText,
+ cancelQuit);
+ }
+ else
+ {
+ confirmResponse = Cache
+ .getDefault("ALWAYS_CLOSE_EXTERNAL_VIEWERS", false)
+ ? JvOptionPane.YES_OPTION
+ : JvOptionPane.NO_OPTION;
+ }
if (confirmResponse == JvOptionPane.CANCEL_OPTION)
{
}
}
- Callable<Void> next = null;
+ Runnable next = null;
switch (gotQuitResponse())
{
case QUIT:
return gotQuitResponse();
}
- private static QResponse waitQuit(boolean interactive,
- Callable<Void> okQuit, Callable<Void> forceQuit,
- Callable<Void> cancelQuit)
+ private static QResponse waitQuit(boolean interactive, Runnable okQuit,
+ Runnable forceQuit, Runnable cancelQuit)
{
// check for saves in progress
if (!BackupFiles.hasSavesInProgress())