Merge branch 'improvement/JAL-1988+JAL-3416_Java8_macOS_APQHandlers_and_FlatLaF_optio...

diff --git a/help/markdown/releases/release-2_11_2_3.md b/help/markdown/releases/release-2_11_2_3.md
index 99cb736..6f4ce26 100644 (file)
--- a/help/markdown/releases/release-2_11_2_3.md
+++ b/help/markdown/releases/release-2_11_2_3.md
@@ -6,6 +6,8 @@ channel: "release"
 
 ## New Features
 
+
+- <!-- JAL-1988,JAL-3416 --> "Do you really want to Quit ?" prompt on OSX/Java 8
 - <!-- JAL-4004 --> Release notes and what's new documentation pages now generated from individual markdown files
 - <!-- JAL-3989 --> Release process generates Hugo friendly JSON metadata to use when publishing releases on www.jalview.org
 - <!-- JAL-3553 --> New gradle tasks for publishing to the Jalview version archive

diff --git a/src/jalview/jbgui/APQHandlers.java b/src/jalview/jbgui/APQHandlers.java
index 02e7083..1a7e971 100644 (file)
--- a/src/jalview/jbgui/APQHandlers.java
+++ b/src/jalview/jbgui/APQHandlers.java
@@ -67,8 +67,7 @@ public class APQHandlers
         if (confirmQuit)
         {
           // ensure Jalview window is brought to front for Quit confirmation
-          // window to be
-          // visible
+          // window to be visible
 
           // this method of raising the Jalview window is broken in java
           // jalviewDesktop.setVisible(true);

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index e046783..ca95222 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
   {
+    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
@@ -147,7 +148,7 @@ public class GDesktop extends JFrame
      */
     try
     {
-      APQHandlers.setAPQHandlers(this);
+      apqHandlersSet = APQHandlers.setAPQHandlers(this);
     } 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);