X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAPQHandlers.java;h=e5e328f8f6209248e8afc37b09f1d16470c18ebf;hb=7f3e371b7fbae94e9b731956cbdebc866742c692;hp=3ddb4bd9d1a8b274c939c02f8d2c9e1fcf1093c2;hpb=c7827c8c0d28158fcea4ebc132c7b457d60f557d;p=jalview.git

diff --git a/src/jalview/gui/APQHandlers.java b/src/jalview/gui/APQHandlers.java
index 3ddb4bd..e5e328f 100644
--- a/src/jalview/gui/APQHandlers.java
+++ b/src/jalview/gui/APQHandlers.java
@@ -20,6 +20,7 @@
  */
 package jalview.gui;
 
+import jalview.bin.Cache;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 
@@ -39,10 +40,12 @@ public class APQHandlers
 {
   private static boolean setAPQHandlers = false;
 
-  public APQHandlers() {
+  public APQHandlers()
+  {
   }
 
-  protected static boolean setAPQHandlers(jalview.gui.Desktop jalviewDesktop)
+  protected static boolean setAPQHandlers(
+          jalview.gui.Desktop jalviewDesktop)
   {
     // flagging this test to avoid unnecessary reflection
     if (!setAPQHandlers)
@@ -58,7 +61,7 @@ public class APQHandlers
 
         if (specversion >= 9)
         {
-          if (Platform.isAMac())
+          if (Platform.isAMacAndNotJS())
           {
             if (desktopClass.getDeclaredMethod("setAboutHandler",
                     new Class[]
@@ -81,16 +84,14 @@ public class APQHandlers
                     { PreferencesHandler.class }) != null)
             {
 
-              hdesktop.setPreferencesHandler(
-                      new PreferencesHandler()
+              hdesktop.setPreferencesHandler(new PreferencesHandler()
               {
-                        @Override
-                        public void handlePreferences(
-                                PreferencesEvent e)
-                        {
-                          jalviewDesktop.preferences_actionPerformed(null);
-                        }
-                      });
+                @Override
+                public void handlePreferences(PreferencesEvent e)
+                {
+                  jalviewDesktop.preferences_actionPerformed(null);
+                }
+              });
 
             }
 
@@ -102,13 +103,11 @@ public class APQHandlers
               hdesktop.setQuitHandler(new QuitHandler()
               {
                 @Override
-                public void handleQuitRequestWith(
-                        QuitEvent e, QuitResponse r)
+                public void handleQuitRequestWith(QuitEvent e,
+                        QuitResponse r)
                 {
-                  boolean confirmQuit = jalview.bin.Cache
-                          .getDefault(
-                                  jalview.gui.Desktop.CONFIRM_KEYBOARD_QUIT,
-                                  true);
+                  boolean confirmQuit = Cache.getDefault(
+                          jalview.gui.Desktop.CONFIRM_KEYBOARD_QUIT, true);
                   int n;
                   if (confirmQuit)
                   {
@@ -137,8 +136,7 @@ public class APQHandlers
                   }
                 }
               });
-              hdesktop.setQuitStrategy(
-                      QuitStrategy.CLOSE_ALL_WINDOWS);
+              hdesktop.setQuitStrategy(QuitStrategy.CLOSE_ALL_WINDOWS);
 
             }
           }
@@ -164,7 +162,7 @@ public class APQHandlers
       }
 
     }
-    
+
     return setAPQHandlers;
   }