From 64593426f7198a007ac3529c75c036e29858a9c8 Mon Sep 17 00:00:00 2001
From: Ben Soares <b.soares@dundee.ac.uk>
Date: Thu, 23 Jun 2022 15:28:46 +0100
Subject: [PATCH] JAL-1988 Check for setHandler capability to avoid About and
 Preferences menu options disappearing into a void

---
 src/jalview/jbgui/APQHandlers.java |  118 +++++++++++++++++++++---------------
 src/jalview/jbgui/GDesktop.java    |    4 +-
 2 files changed, 71 insertions(+), 51 deletions(-)

diff --git a/src/jalview/jbgui/APQHandlers.java b/src/jalview/jbgui/APQHandlers.java
index e18ec44..02e7083 100644
--- a/src/jalview/jbgui/APQHandlers.java
+++ b/src/jalview/jbgui/APQHandlers.java
@@ -24,67 +24,87 @@ 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
 {
-  protected static boolean setAPQHandlers = false;
+  public static boolean setAbout = false;
 
-  public static boolean setAPQHandlers(GDesktop desktop)
-  {
-    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
+  public static boolean setPreferences = false;
 
-        // this method of raising the Jalview window is broken in java
-        // jalviewDesktop.setVisible(true);
-        // jalviewDesktop.toFront();
+  public static boolean setQuit = false;
 
-        // a better hack which works instead
-        JFrame dialogParent = new JFrame();
-        dialogParent.setAlwaysOnTop(true);
+  public static boolean setAPQHandlers(GDesktop desktop)
+  {
+    if (Platform.isJS())
+    {
+      return false;
+    }
+    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
 
-        n = JOptionPane.showConfirmDialog(dialogParent,
-                MessageManager.getString("label.quit_jalview"),
-                MessageManager.getString("action.quit"),
-                JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE,
-                null);
+          // this method of raising the Jalview window is broken in java
+          // jalviewDesktop.setVisible(true);
+          // jalviewDesktop.toFront();
 
-        dialogParent.setAlwaysOnTop(false);
-        dialogParent.dispose();
-      }
-      else
-      {
-        n = JOptionPane.OK_OPTION;
-      }
-      canQuit = (n == JOptionPane.OK_OPTION);
-      if (canQuit)
-      {
-        response.performQuit();
-      }
-      else
-      {
-        response.cancelQuit();
-      }
-    });
+          // a better hack which works instead
+          JFrame dialogParent = new JFrame();
+          dialogParent.setAlwaysOnTop(true);
 
-    setAPQHandlers = true;
+          n = JOptionPane.showConfirmDialog(dialogParent,
+                  MessageManager.getString("label.quit_jalview"),
+                  MessageManager.getString("action.quit"),
+                  JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE,
+                  null);
 
-    return setAPQHandlers;
+          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 setAbout || setPreferences || setQuit;
   }
 
 }
diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index f3d9a65..996cb1f 100755
--- a/src/jalview/jbgui/GDesktop.java
+++ b/src/jalview/jbgui/GDesktop.java
@@ -405,12 +405,12 @@ public class GDesktop extends JFrame
     FileMenu.add(loadState);
     FileMenu.addSeparator();
     FileMenu.add(quit);
-    if (!APQHandlers.setAPQHandlers)
+    if (!APQHandlers.setAbout)
     {
       HelpMenu.add(aboutMenuItem);
     }
     HelpMenu.add(documentationMenuItem);
-    if (!APQHandlers.setAPQHandlers)
+    if (!APQHandlers.setPreferences)
     {
       toolsMenu.add(preferences);
     }
-- 
1.7.10.2