[lwjgl] 04/05: unapply nomacosx.diff

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository lwjgl.

commit 6c1c9572cd4f9b5ab4024a0ca623a1b13c84c35e
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Mon Oct 27 00:29:05 2014 +0000

    unapply nomacosx.diff
---
 build.xml                                       | 12 ++++++------
 platform_build/build-applet.xml                 |  2 +-
 src/java/org/lwjgl/MacOSXSysImplementation.java |  4 ++--
 src/java/org/lwjgl/opengl/MacOSXDisplay.java    | 10 +++++-----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/build.xml b/build.xml
index 1c9de6b..8d25e18 100644
--- a/build.xml
+++ b/build.xml
@@ -246,7 +246,7 @@
 			<class name="org.lwjgl.opengl.WindowsContextImplementation" />
 		</javah>
 
-		<!--		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
+		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
 			<class name="org.lwjgl.MacOSXSysImplementation" />
 			<class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
 			<class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
@@ -254,7 +254,7 @@
 			<class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" />
 			<class name="org.lwjgl.opengl.MacOSXDisplay" />
 			<class name="org.lwjgl.opengl.MacOSXContextImplementation" />
-		</javah> -->
+		</javah>
 
 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
 			<class name="org.lwjgl.opengl.AWTSurfaceLock" />
@@ -293,13 +293,13 @@
 				</tokenfilter>
 			</filterchain>
 		</loadfile>
-		<!--		<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
+		<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
 			<filterchain>
 				<tokenfilter>
 	    		<containsstring contains="JNI_VERSION ="/>
 				</tokenfilter>
 			</filterchain>
-		</loadfile> -->
+		</loadfile>
 		<loadfile srcfile="${lwjgl.src.native}/windows/org_lwjgl_WindowsSysImplementation.h" property="lwjgl.native.windows.version">
 			<filterchain>
 				<tokenfilter>
@@ -314,13 +314,13 @@
 				</tokenfilter>
 			</filterchain>
 		</loadfile>
-		<!--		<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
+		<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
 			<filterchain>
 				<tokenfilter>
 	    		<containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/>
 				</tokenfilter>
 			</filterchain>
-		</loadfile> -->
+		</loadfile>
 		<echo>
 			lwjgl.java.windows.version = ${lwjgl.java.windows.version}
 			lwjgl.native.windows.version = ${lwjgl.native.windows.version}
diff --git a/platform_build/build-applet.xml b/platform_build/build-applet.xml
index d96a305..588347d 100644
--- a/platform_build/build-applet.xml
+++ b/platform_build/build-applet.xml
@@ -1,7 +1,7 @@
 <project name="applet">
 
 	<!-- Create our packer task -->
-<!--	<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>	-->
+	<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
 
 	<target name="applet">
 		<antcall target="-applet">
diff --git a/src/java/org/lwjgl/MacOSXSysImplementation.java b/src/java/org/lwjgl/MacOSXSysImplementation.java
index 505c074..3b6b32f 100644
--- a/src/java/org/lwjgl/MacOSXSysImplementation.java
+++ b/src/java/org/lwjgl/MacOSXSysImplementation.java
@@ -33,7 +33,7 @@ package org.lwjgl;
 
 import java.awt.Toolkit;
 
-//import com.apple.eio.FileManager;
+import com.apple.eio.FileManager;
 
 /**
  *
@@ -55,7 +55,7 @@ final class MacOSXSysImplementation extends J2SESysImplementation {
 
 	public boolean openURL(String url) {
 		try {
-//			FileManager.openURL(url);
+			FileManager.openURL(url);
 			return true;
 		} catch (Exception e) {
 			LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e);
diff --git a/src/java/org/lwjgl/opengl/MacOSXDisplay.java b/src/java/org/lwjgl/opengl/MacOSXDisplay.java
index 6e46da5..eaccaee 100644
--- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java
+++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java
@@ -54,9 +54,9 @@ import org.lwjgl.BufferUtils;
 import org.lwjgl.LWJGLException;
 import org.lwjgl.LWJGLUtil;
 
-//import com.apple.eawt.Application;
-//import com.apple.eawt.ApplicationAdapter;
-//import com.apple.eawt.ApplicationEvent;
+import com.apple.eawt.Application;
+import com.apple.eawt.ApplicationAdapter;
+import com.apple.eawt.ApplicationEvent;
 
 import static org.lwjgl.opengl.GL11.*;
 
@@ -79,11 +79,11 @@ final class MacOSXDisplay implements DisplayImplementation {
 		try {
 			AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
 				public Object run() throws Exception {
-/*					Application.getApplication().addApplicationListener(new ApplicationAdapter() {
+					Application.getApplication().addApplicationListener(new ApplicationAdapter() {
 						public void handleQuit(ApplicationEvent event) {
 							doHandleQuit();
 						}
-					});	*/
+					});
 					return null;
 				}
 			});

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lwjgl.git