Merge branch 'fix-quitting-on-macos' into develop

Author: chewiebug

pom.xml

@@ -73,6 +73,7 @@
         </developer>
         <developer>
             <name>Johan Kaving</name>
+            <url>https://github.com/jkaving/</url>
         </developer>
         <developer>
             <name>Maciej Kwiecien</name>

src/main/java/com/tagtraum/perf/gcviewer/ctrl/action/Exit.java

@@ -39,7 +39,8 @@ public void actionPerformed(final ActionEvent e) {
     }
 
     // Used by OS X adaptations
-    public void quit() {
+    public boolean quit() {
         actionPerformed(null);
+        return true;
     }
 }

src/main/java/com/tagtraum/perf/gcviewer/view/util/OSXSupport.java

@@ -1,16 +1,15 @@
 package com.tagtraum.perf.gcviewer.view.util;
 
-import javax.swing.Action;
-
-import com.tagtraum.perf.gcviewer.util.LoggerHelper;
-
 import java.awt.Image;
 import java.awt.Window;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.swing.Action;
+
+import com.tagtraum.perf.gcviewer.util.LoggerHelper;
 
 /**
  * Handles Mac OS X specific stuff.
@@ -112,7 +111,7 @@ public static void addOSXHandler(String handlerClassName,
 
             Class<?> handlerClass = Class.forName(handlerClassName);
             if (action != null) {
-                Object aboutHandlerProxy =
+                Object handlerProxy =
                     Proxy.newProxyInstance(OSXSupport.class.getClassLoader(),
                                            new Class[]{handlerClass},
                                            new InvocationHandler() {
@@ -121,10 +120,15 @@ public Object invoke(Object o, Method method, Object[] args) throws Throwable {
                                                    if (method.getName().equals(handlerMethodName)) {
                                                        action.actionPerformed(null);
                                                    }
+                                                   if (method.getName().equals("handleQuitRequestWith")) {
+                                                       // https://www.coderanch.com/how-to/javadoc/appledoc/api/com/apple/eawt/QuitHandler.html
+                                                       Object quitResponse = args[1];
+                                                       Class.forName("com.apple.eawt.QuitResponse").getDeclaredMethod("performQuit").invoke(quitResponse);
+                                                   }
                                                    return null;
                                                }
                                            });
-                application.getClass().getMethod(handlerSetterMethodName, handlerClass).invoke(application, aboutHandlerProxy);
+                application.getClass().getMethod(handlerSetterMethodName, handlerClass).invoke(application, handlerProxy);
             } else {
                 application.getClass().getMethod(handlerSetterMethodName, handlerClass).invoke(application, (Object) null);
             }