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
Merge branch 'improvement/JAL-1988+JAL-3416_Java8_macOS_APQHandlers_and_FlatLaF_optio...
[jalview.git]
/
src
/
jalview
/
jbgui
/
GDesktop.java
diff --git
a/src/jalview/jbgui/GDesktop.java
b/src/jalview/jbgui/GDesktop.java
index
996cb1f
..
459835d
100755
(executable)
--- a/
src/jalview/jbgui/GDesktop.java
+++ b/
src/jalview/jbgui/GDesktop.java
@@
-140,6
+140,7
@@
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
@@
-147,7
+148,7
@@
public class GDesktop extends JFrame
*/
try
{
*/
try
{
- APQHandlers.setAPQHandlers(this);
+ apqHandlersSet = APQHandlers.setAPQHandlers(this);
} catch (Exception e)
{
System.out.println("Cannot set APQHandlers");
} catch (Exception e)
{
System.out.println("Cannot set APQHandlers");
@@
-389,10
+390,6
@@
public class GDesktop extends JFrame
}
});
}
});
- Float specversion = Platform.isJS() ? Float.valueOf(8)
- : Float.parseFloat(
- System.getProperty("java.specification.version"));
-
desktopMenubar.add(FileMenu);
desktopMenubar.add(toolsMenu);
desktopMenubar.add(HelpMenu);
desktopMenubar.add(FileMenu);
desktopMenubar.add(toolsMenu);
desktopMenubar.add(HelpMenu);