From 4e432b9e3e1b5e32971893dad4c250eb5014fe70 Mon Sep 17 00:00:00 2001
From: Elias Naur <elias.naur@gmail.com>
Date: Tue, 22 Apr 2008 16:52:16 +0000
Subject: [PATCH] Added ApplejavaExtensions.jar to be able to use apple
 extensions without reflection

---
 build.xml                                    |   2 +-
 libs/AppleJavaExtensions.jar                 | Bin 0 -> 4189 bytes
 src/java/org/lwjgl/opengl/MacOSXDisplay.java |  68 ++++++-------------
 3 files changed, 22 insertions(+), 48 deletions(-)
 create mode 100755 libs/AppleJavaExtensions.jar

diff --git a/build.xml b/build.xml
index 42c0abe7..089d33af 100644
--- a/build.xml
+++ b/build.xml
@@ -224,7 +224,7 @@
 	
 	<!-- Compiles the Java source code -->
 	<target name="compile" description="Compiles the java source code" depends="-initialize">
-		<javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar" taskname="core">
+		<javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core">
 			<src path="${lwjgl.src}/java/"/>
 			<src path="${lwjgl.src}/generated/"/>
 			<include name="org/lwjgl/*.java"/>
diff --git a/libs/AppleJavaExtensions.jar b/libs/AppleJavaExtensions.jar
new file mode 100755
index 0000000000000000000000000000000000000000..160d62b669d18bc8d67a67df9e2d4b1bed8c544c
GIT binary patch
literal 4189
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
MrSl<wE92k)0OiODS^xk5

literal 0
HcmV?d00001

diff --git a/src/java/org/lwjgl/opengl/MacOSXDisplay.java b/src/java/org/lwjgl/opengl/MacOSXDisplay.java
index cad5fbcd..ab3faf42 100644
--- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java
+++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java
@@ -57,6 +57,8 @@ import org.lwjgl.BufferUtils;
 import org.lwjgl.LWJGLException;
 import org.lwjgl.LWJGLUtil;
 
+import com.apple.eawt.*;
+
 final class MacOSXDisplay implements DisplayImplementation {
 	private static final int PBUFFER_HANDLE_SIZE = 24;
 	private static final int GAMMA_LENGTH = 256;
@@ -73,7 +75,24 @@ final class MacOSXDisplay implements DisplayImplementation {
 	private boolean close_requested;
 
 	MacOSXDisplay() {
-		new MacOSXApplicationListener();
+		try {
+			AccessController.doPrivileged(new PrivilegedExceptionAction() {
+				public Object run() throws Exception {
+					Application.getApplication().addApplicationListener(new ApplicationAdapter() {
+						public final void handleQuit(ApplicationEvent event) {
+							doHandleQuit();
+						}
+					});
+					return null;
+				}
+			});
+		} catch (Throwable e) {
+			/**
+			 * In an applet environment, referencing com.apple.eawt.Application can fail with
+			 * a native exception. So log any exceptions instead of re-throwing.
+			 */
+			LWJGLUtil.log("Failed to register quit handler: " + e.getMessage());
+		}
 	}
 
 	public void createWindow(DisplayMode mode, boolean fullscreen, Canvas parent, int x, int y) throws LWJGLException {
@@ -96,7 +115,7 @@ final class MacOSXDisplay implements DisplayImplementation {
 		}
 	}
 
-	private void handleQuit() {
+	private void doHandleQuit() {
 		synchronized (this) {
 			close_requested = true;
 		}
@@ -407,51 +426,6 @@ final class MacOSXDisplay implements DisplayImplementation {
 			return 0;
 	}
 
-	/**
-	 * This class captures com.apple.eawt.ApplicationEvents through reflection
-	 * to enable compilation on other platforms than Mac OS X
-	 */
-	private class MacOSXApplicationListener implements InvocationHandler {
-		private final Method handleQuit;
-
-		public MacOSXApplicationListener() {
-			Method m = null;
-			try {
-				m = (Method)AccessController.doPrivileged(new PrivilegedExceptionAction() {
-					public Object run() throws Exception {
-						/* Get the com.apple.eawt.Application class */
-						Class com_apple_eawt_Application = Class.forName("com.apple.eawt.Application");
-						/* Call the static Application.getApplication() method */
-						Object application = com_apple_eawt_Application.getMethod("getApplication", null).invoke(null, null);
-						/* Create a proxy implementing com.apple.eawt.ApplicationListener */
-						Class com_apple_eawt_ApplicationListener = Class.forName("com.apple.eawt.ApplicationListener");
-						Object listener_proxy = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] {com_apple_eawt_ApplicationListener}, MacOSXApplicationListener.this);
-						/* Invoke the method application.addApplicationListener(proxy) */
-						Method addApplicationListener = com_apple_eawt_Application.getMethod("addApplicationListener", new Class[]{com_apple_eawt_ApplicationListener});
-						addApplicationListener.invoke(application, new Object[]{listener_proxy});
-						/* Finally, get the handleQuit method we want to react to */
-						Class com_apple_eawt_ApplicationEvent = Class.forName("com.apple.eawt.ApplicationEvent");
-						return com_apple_eawt_ApplicationListener.getMethod("handleQuit", new Class[]{com_apple_eawt_ApplicationEvent});
-					}
-				});
-			} catch (Throwable e) {
-				/**
-				 * In an applet environment, referencing com.apple.eawt.Application can fail with
-				 * a native exception. So log any exceptions instead of re-throwing.
-				 */
-				LWJGLUtil.log("Failed to register quit handler: " + e.getMessage());
-//				throw new RuntimeException(e);
-			}
-			handleQuit = m;
-		}
-
-		public Object invoke(Object proxy, Method method, Object[] args) {
-			if (method.equals(handleQuit))
-				handleQuit();
-			return null;
-		}
-	}
-
 	public boolean isBufferLost(PeerInfo handle) {
 		return false;
 	}