git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-629 Firm up bootstrapArgs. Correct '-colour' in test. Separate --headless and...
[jalview.git]
/
src
/
jalview
/
jbgui
/
GDesktop.java
diff --git
a/src/jalview/jbgui/GDesktop.java
b/src/jalview/jbgui/GDesktop.java
index
7b4f477
..
b0079b4
100755
(executable)
--- a/
src/jalview/jbgui/GDesktop.java
+++ b/
src/jalview/jbgui/GDesktop.java
@@
-32,9
+32,9
@@
import javax.swing.JMenuItem;
import jalview.api.AlignmentViewPanel;
import jalview.bin.Cache;
import jalview.api.AlignmentViewPanel;
import jalview.bin.Cache;
+import jalview.gui.APQHandlers;
import jalview.gui.Desktop;
import jalview.io.FileFormatException;
import jalview.gui.Desktop;
import jalview.io.FileFormatException;
-import jalview.jbgui.QuitHandler.QResponse;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.util.MessageManager;
import jalview.util.Platform;
@@
-142,7
+142,6
@@
public class GDesktop extends JFrame
*/
private void jbInit() throws Exception
{
*/
private void jbInit() throws Exception
{
- boolean apqHandlersSet = false;
/**
* APQHandlers sets handlers for About, Preferences and Quit actions
* peculiar to macOS's application menu. APQHandlers will check to see if a
/**
* APQHandlers sets handlers for About, Preferences and Quit actions
* peculiar to macOS's application menu. APQHandlers will check to see if a
@@
-150,7
+149,7
@@
public class GDesktop extends JFrame
*/
try
{
*/
try
{
- apqHandlersSet = APQHandlers.setAPQHandlers(this);
+ APQHandlers.setAPQHandlers((Desktop) this);
} catch (Exception e)
{
System.out.println("Cannot set APQHandlers");
} catch (Exception e)
{
System.out.println("Cannot set APQHandlers");
@@
-215,14
+214,8
@@
public class GDesktop extends JFrame
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- QResponse qresponse = Desktop.instance != null
- ? Desktop.instance.desktopQuit()
- : QResponse.QUIT;
- if (qresponse == QResponse.CANCEL_QUIT)
- {
- jalview.bin.Console
- .debug("GDesktop: Quit action cancelled by user");
- }
+ if (Desktop.instance != null)
+ Desktop.instance.desktopQuit();
}
});
aboutMenuItem.setText(MessageManager.getString("label.about"));
}
});
aboutMenuItem.setText(MessageManager.getString("label.about"));