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

diff --combined src/jalview/jbgui/APQHandlers.java
index 5e04b14,02e7083..1a7e971
--- 1/src/jalview/jbgui/APQHandlers.java
--- 2/src/jalview/jbgui/APQHandlers.java
+++ b/src/jalview/jbgui/APQHandlers.java
@@@ -24,68 -24,87 +24,86 @@@ import javax.swing.JFrame
  import javax.swing.JOptionPane;
  
  import com.formdev.flatlaf.extras.FlatDesktop;
+ import com.formdev.flatlaf.extras.FlatDesktop.Action;
  
  import jalview.util.MessageManager;
  import jalview.util.Platform;
  
  public class APQHandlers
  {
+   public static boolean setAbout = false;
+ 
+   public static boolean setPreferences = false;
+ 
+   public static boolean setQuit = false;
+ 
    public static boolean setAPQHandlers(GDesktop desktop)
    {
      if (Platform.isJS())
      {
        return false;
      }
-     FlatDesktop.setAboutHandler(() -> {
-       desktop.aboutMenuItem_actionPerformed(null);
-     });
-     FlatDesktop.setPreferencesHandler(() -> {
-       desktop.preferences_actionPerformed(null);
-     });
-     FlatDesktop.setQuitHandler(response -> {
-       boolean confirmQuit = jalview.bin.Cache
-               .getDefault(jalview.gui.Desktop.CONFIRM_KEYBOARD_QUIT, true);
-       boolean canQuit = !confirmQuit;
-       int n;
-       if (confirmQuit)
-       {
-         // ensure Jalview window is brought to front for Quit confirmation
-         // window to be
-         // visible
+     if (FlatDesktop.isSupported(Action.APP_ABOUT))
+     {
+       FlatDesktop.setAboutHandler(() -> {
+         desktop.aboutMenuItem_actionPerformed(null);
+       });
+       setAbout = true;
+     }
+     if (FlatDesktop.isSupported(Action.APP_PREFERENCES))
+     {
+       FlatDesktop.setPreferencesHandler(() -> {
+         desktop.preferences_actionPerformed(null);
+       });
+       setPreferences = true;
+     }
+     if (FlatDesktop.isSupported(Action.APP_QUIT_HANDLER))
+     {
+       FlatDesktop.setQuitHandler(response -> {
+         boolean confirmQuit = jalview.bin.Cache.getDefault(
+                 jalview.gui.Desktop.CONFIRM_KEYBOARD_QUIT, true);
+         boolean canQuit = !confirmQuit;
+         int n;
+         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);
-         // jalviewDesktop.toFront();
+           // this method of raising the Jalview window is broken in java
+           // jalviewDesktop.setVisible(true);
+           // jalviewDesktop.toFront();
  
-         // a better hack which works instead
-         JFrame dialogParent = new JFrame();
-         dialogParent.setAlwaysOnTop(true);
+           // a better hack which works instead
+           JFrame dialogParent = new JFrame();
+           dialogParent.setAlwaysOnTop(true);
  
-         n = JOptionPane.showConfirmDialog(dialogParent,
-                 MessageManager.getString("label.quit_jalview"),
-                 MessageManager.getString("action.quit"),
-                 JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE,
-                 null);
+           n = JOptionPane.showConfirmDialog(dialogParent,
+                   MessageManager.getString("label.quit_jalview"),
+                   MessageManager.getString("action.quit"),
+                   JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE,
+                   null);
  
-         dialogParent.setAlwaysOnTop(false);
-         dialogParent.dispose();
-       }
-       else
-       {
-         n = JOptionPane.OK_OPTION;
-       }
-       canQuit = (n == JOptionPane.OK_OPTION);
-       if (canQuit)
-       {
-         response.performQuit();
-       }
-       else
-       {
-         response.cancelQuit();
-       }
-     });
+           dialogParent.setAlwaysOnTop(false);
+           dialogParent.dispose();
+         }
+         else
+         {
+           n = JOptionPane.OK_OPTION;
+         }
+         canQuit = (n == JOptionPane.OK_OPTION);
+         if (canQuit)
+         {
+           response.performQuit();
+         }
+         else
+         {
+           response.cancelQuit();
+         }
+       });
+       setQuit = true;
+     }
      // if we got to here, no exceptions occurred when we set the handlers.
-     return true;
+     return setAbout || setPreferences || setQuit;
    }
  
  }

diff --combined src/jalview/jbgui/GDesktop.java
index 98217b1,996cb1f..459835d
--- 1/src/jalview/jbgui/GDesktop.java
--- 2/src/jalview/jbgui/GDesktop.java
+++ b/src/jalview/jbgui/GDesktop.java
@@@ -140,7 -140,6 +140,7 @@@ public class GDesktop extends JFram
     */
    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
@@@ -148,7 -147,7 +148,7 @@@
       */
      try
      {
 -      APQHandlers.setAPQHandlers(this);
 +      apqHandlersSet = APQHandlers.setAPQHandlers(this);
      } catch (Exception e)
      {
        System.out.println("Cannot set APQHandlers");
@@@ -390,6 -389,10 +390,6 @@@
        }
      });
  
 -    Float specversion = Platform.isJS() ? Float.valueOf(8)
 -            : Float.parseFloat(
 -                    System.getProperty("java.specification.version"));
 -
      desktopMenubar.add(FileMenu);
      desktopMenubar.add(toolsMenu);
      desktopMenubar.add(HelpMenu);
@@@ -402,12 -405,12 +402,12 @@@
      FileMenu.add(loadState);
      FileMenu.addSeparator();
      FileMenu.add(quit);
-     if (!apqHandlersSet)
+     if (!APQHandlers.setAbout)
      {
        HelpMenu.add(aboutMenuItem);
      }
      HelpMenu.add(documentationMenuItem);
-     if (!apqHandlersSet)
+     if (!APQHandlers.setPreferences)
      {
        toolsMenu.add(preferences);
      }