JAL-3949 Complete new abstracted logging framework in jalview.log. Updated log calls...

[jalview.git] / src / jalview / gui / APQHandlers.java

diff --git a/src/jalview/gui/APQHandlers.java b/src/jalview/gui/APQHandlers.java
index 31f7a6d..4d3a3f3 100644 (file)
--- a/src/jalview/gui/APQHandlers.java
+++ b/src/jalview/gui/APQHandlers.java
@@ -1,5 +1,26 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
+import jalview.bin.Cache;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 
@@ -38,7 +59,7 @@ public class APQHandlers
 
         if (specversion >= 9)
         {
-          if (Platform.isAMac())
+          if (Platform.isAMacAndNotJS())
           {
             if (desktopClass.getDeclaredMethod("setAboutHandler",
                     new Class[]
@@ -85,8 +106,9 @@ public class APQHandlers
                 public void handleQuitRequestWith(
                         QuitEvent e, QuitResponse r)
                 {
-                  boolean confirmQuit = jalview.bin.Cache
-                          .getDefault(jalviewDesktop.CONFIRM_KEYBOARD_QUIT,
+                  boolean confirmQuit = Cache
+                          .getDefault(
+                                  jalview.gui.Desktop.CONFIRM_KEYBOARD_QUIT,
                                   true);
                   int n;
                   if (confirmQuit)
@@ -134,12 +156,12 @@ public class APQHandlers
       {
         System.out.println(
                 "Exception when looking for About, Preferences, Quit Handlers");
-        e.printStackTrace();
+        // e.printStackTrace();
       } catch (Throwable t)
       {
         System.out.println(
                 "Throwable when looking for About, Preferences, Quit Handlers");
-        t.printStackTrace();
+        // t.printStackTrace();
       }
 
     }