java-game-lib-cvs Mailing List for Lightweight Java Game Library

Revision: 3493
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3493&view=rev
Author:   kappa1
Date:     2011-02-20 20:26:17 +0000 (Sun, 20 Feb 2011)

Log Message:
-----------
AppletLoader: replace appletlogo.png with appletlogo.gif (43% smaller)

Modified Paths:
--------------
    trunk/LWJGL/applet/advance/appletloader.html
    trunk/LWJGL/applet/basic/basicapplet.html

Added Paths:
-----------
    trunk/LWJGL/res/appletlogo.gif

Removed Paths:
-------------
    trunk/LWJGL/res/appletlogo.png

Modified: trunk/LWJGL/applet/advance/appletloader.html
===================================================================
--- trunk/LWJGL/applet/advance/appletloader.html	2011-02-17 19:43:33 UTC (rev 3492)
+++ trunk/LWJGL/applet/advance/appletloader.html	2011-02-20 20:26:17 UTC (rev 3493)
@@ -16,7 +16,7 @@
     <param name="al_main" value="org.lwjgl.test.applet.GearsApplet">
     
     <!-- logo to paint while loading, will be centered -->
-    <param name="al_logo" value="appletlogo.png">
+    <param name="al_logo" value="appletlogo.gif">
     
     <!-- progressbar to paint while loading. Will be painted on top of logo, width clipped to percentage done -->
     <param name="al_progressbar" value="appletprogress.gif">

Modified: trunk/LWJGL/applet/basic/basicapplet.html
===================================================================
--- trunk/LWJGL/applet/basic/basicapplet.html	2011-02-17 19:43:33 UTC (rev 3492)
+++ trunk/LWJGL/applet/basic/basicapplet.html	2011-02-20 20:26:17 UTC (rev 3493)
@@ -16,7 +16,7 @@
     <param name="al_main" value="org.lwjgl.test.applet.GearsApplet">
     
     <!-- logo to paint while loading, will be centered -->
-    <param name="al_logo" value="appletlogo.png">
+    <param name="al_logo" value="appletlogo.gif">
     
     <!-- progressbar to paint while loading. Will be painted on top of logo, width clipped to percentage done -->
     <param name="al_progressbar" value="appletprogress.gif">

Added: trunk/LWJGL/res/appletlogo.gif
===================================================================
(Binary files differ)


Property changes on: trunk/LWJGL/res/appletlogo.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/LWJGL/res/appletlogo.png
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3492
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3492&view=rev
Author:   kappa1
Date:     2011-02-17 19:43:33 +0000 (Thu, 17 Feb 2011)

Log Message:
-----------
AppletLoader: add missing javadoc for the "lwjgl_arguments" parameter.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-17 19:09:59 UTC (rev 3491)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-17 19:43:33 UTC (rev 3492)
@@ -97,9 +97,11 @@
  * The following applet parameters are required:
  * <ul>
  * <li>al_main - [String] Full package and class the applet to instantiate and display when loaded.</li>
+ * <li>al_jars - [String] Comma seperated list of jars to download.</li>
+ * <p>
  * <li>al_logo - [String Path of of the logo resource to paint while loading.</li>
  * <li>al_progressbar - [String] Path of the progressbar resource to paint on top of the logo, width clipped by percentage.</li>
- * <li>al_jars - [String] Comma seperated list of jars to download.</li>
+ * <p>
  * <li>al_windows - [String] Jar containing native files for windows.</li>
  * <li>al_linux - [String] Jar containing native files for linux.</li>
  * <li>al_mac - [String] Jar containing native files for mac.</li>
@@ -115,14 +117,16 @@
  * <li>al_cache - [boolean] Whether to use cache system. <i>Default: true</i>.</li>
  * <li>al_debug - [boolean] Whether to enable debug mode. <i>Default: false</i>.</li>
  * <li>al_prepend_host - [boolean] Whether to limit caching to this domain, disable if your applet is hosted on multple domains and needs to share the cache. <i>Default: true</i>.</li>
- * <ul>
+ * <p>
  * <li>al_windows64 - [String] If specified it will be used instead of al_windows on 64bit windows systems.</li>
  * <li>al_windows32 - [String] If specifed it will be used instead of al_windows on 32bit windows systems.</li>
  * <li>al_linux64 - [String] If specifed it will be used instead of al_linux on 64bit linux systems.</li>
  * <li>al_linux32 - [String] If specifed it will be used instead of al_linux on 32bit linux systems.</li>
- * <ul>
+ * <p>
  * <li>boxbgcolor - [String] any String AWT color ("red", "blue", etc), RGB (0-255) or hex formated color (#RRGGBB) to use as background. <i>Default: #ffffff</i>.</li>
  * <li>boxfgcolor - [String] any String AWT color ("red", "blue", etc), RGB (0-255) or hex formated color (#RRGGBB) to use as foreground. <i>Default: #000000</i>.</li>
+ * <p>
+ * <li>lwjgl_arguments - </li> [String] used to pass the hidden LWJGL parameters to LWJGL e.g. ("-Dorg.lwjgl.input.Mouse.allowNegativeMouseCoords=true -Dorg.lwjgl.util.Debug=true").</li>
  * </ul>
  * </p>
  * @author kappaOne


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3491
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3491&view=rev
Author:   kappa1
Date:     2011-02-17 19:09:59 +0000 (Thu, 17 Feb 2011)

Log Message:
-----------
AppletLoader Fix: set correct context classloader for the applet loaded by the AppletLoader. Credit to arielsan for finding the issue and supplying a fix/patch.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-14 20:42:15 UTC (rev 3490)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-17 19:09:59 UTC (rev 3491)
@@ -774,7 +774,7 @@
 			// set lwjgl properties
 			setLWJGLProperties();
 
-			// make applet switch on EDT as an AWT/Swing permission dialog could be called
+			// make applet switch on the EDT as an AWT/Swing permission dialog could be called
 			EventQueue.invokeAndWait(new Runnable() {
 	            public void run() {
 					try {
@@ -1023,7 +1023,10 @@
 		percentage = 100;
 
 		debug_sleep(2000);
-
+		
+		// set correct context classloader for lwjgl applet
+		Thread.currentThread().setContextClassLoader(classLoader);
+		
 		Class appletClass = classLoader.loadClass(getParameter("al_main"));
 		lwjglApplet = (Applet) appletClass.newInstance();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3490
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3490&view=rev
Author:   matzon
Date:     2011-02-14 20:42:15 +0000 (Mon, 14 Feb 2011)

Log Message:
-----------
arielsans maven jinput patch 

Modified Paths:
--------------
    trunk/LWJGL/maven/build.xml
    trunk/LWJGL/maven/lwjgl-parent.pom
    trunk/LWJGL/maven/lwjgl.pom
    trunk/LWJGL/platform_build/build-maven.xml

Added Paths:
-----------
    trunk/LWJGL/maven/jinput-platform.pom
    trunk/LWJGL/maven/jinput.pom

Modified: trunk/LWJGL/maven/build.xml
===================================================================
--- trunk/LWJGL/maven/build.xml	2011-02-09 21:12:01 UTC (rev 3489)
+++ trunk/LWJGL/maven/build.xml	2011-02-14 20:42:15 UTC (rev 3490)
@@ -1,15 +1,26 @@
 <project name="maven" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 	
-	<property name="mavenrepo"			value="mvnrepo" />
-	<property name="mavenrepoId"		value="tmprepo" />
+	<property name="mavenrepo"			value="file://m2repo" />
+	<property name="mavenrepoId"		value="tmprepoid" />
 	
+	<target name="install">
+		<antcall target="execute">
+			<param name="mvncommand" value="org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file"/>
+		</antcall>
+	</target>
 	
 	<target name="deploy">
+		<antcall target="execute">
+			<param name="mvncommand" value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"/>
+		</antcall>
+	</target>
+	
+	<target name="execute">
 		
-		<!-- deploying parent.pom -->
+		<!-- parent.pom -->
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl-parent.pom" />
@@ -17,10 +28,10 @@
             <arg value="-Plwjglgpg" />
         </artifact:mvn>  
             
-        <!-- deploying lwjgl.jar -->    
+        <!-- lwjgl.jar -->    
         
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl.pom" />
@@ -29,7 +40,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl.pom" />
@@ -39,7 +50,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl.pom" />
@@ -48,10 +59,10 @@
             <arg value="-Plwjglgpg" />
 		</artifact:mvn>
 		
-		<!-- deploying natives -->    
+		<!-- lwjgl natives -->    
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl-platform.pom" />
@@ -61,7 +72,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl-platform.pom" />
@@ -71,7 +82,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl-platform.pom" />
@@ -80,10 +91,10 @@
             <arg value="-Plwjglgpg" />
 		</artifact:mvn>
 		
-		<!-- deploying lwjgl_util.jar -->    
+		<!-- lwjgl_util.jar -->    
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl_util.pom" />
@@ -92,7 +103,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl_util.pom" />
@@ -102,7 +113,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl_util.pom" />
@@ -111,10 +122,10 @@
             <arg value="-Plwjglgpg" />
 		</artifact:mvn>
 		
-		<!-- deploying lwjgl_util_applet.jar -->    
+		<!-- lwjgl_util_applet.jar -->    
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl_util_applet.pom" />
@@ -123,7 +134,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl_util.pom" />
@@ -133,7 +144,7 @@
 		</artifact:mvn>
 		
 		<artifact:mvn>
-			<arg value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+			<arg value="${mvncommand}" />
 			<arg value="-Durl=${mavenrepo}" />
 			<arg value="-DrepositoryId=${mavenrepoId}" />
 			<arg value="-DpomFile=lwjgl_util.pom" />
@@ -141,7 +152,50 @@
 			<arg value="-Dclassifier=javadoc" />
             <arg value="-Plwjglgpg" />
 		</artifact:mvn>
+		
+		<!-- jinput.jar -->    
+		
+		<artifact:mvn>
+			<arg value="${mvncommand}" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=jinput.pom" />
+			<arg value="-Dfile=jinput.jar" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<!-- jinput natives -->    
+				
+		<artifact:mvn>
+			<arg value="${mvncommand}" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=jinput-platform.pom" />
+			<arg value="-Dfile=jinput-platform-natives-win.jar" />
+			<arg value="-Dclassifier=natives-win" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<artifact:mvn>
+			<arg value="${mvncommand}" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=jinput-platform.pom" />
+			<arg value="-Dfile=jinput-platform-natives-linux.jar" />
+			<arg value="-Dclassifier=natives-linux" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
+		<artifact:mvn>
+			<arg value="${mvncommand}" />
+			<arg value="-Durl=${mavenrepo}" />
+			<arg value="-DrepositoryId=${mavenrepoId}" />
+			<arg value="-DpomFile=jinput-platform.pom" />
+			<arg value="-Dfile=jinput-platform-natives-mac.jar" />
+			<arg value="-Dclassifier=natives-mac" />
+            <arg value="-Plwjglgpg" />
+		</artifact:mvn>
+		
 	</target>
-
-
+	
 </project>
\ No newline at end of file

Added: trunk/LWJGL/maven/jinput-platform.pom
===================================================================
--- trunk/LWJGL/maven/jinput-platform.pom	                        (rev 0)
+++ trunk/LWJGL/maven/jinput-platform.pom	2011-02-14 20:42:15 UTC (rev 3490)
@@ -0,0 +1,32 @@
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.lwjgl.lwjgl</groupId>
+		<artifactId>parent</artifactId>
+		<version>@VERSION@</version>
+	</parent>
+	<groupId>org.lwjgl.lwjgl</groupId>
+	<artifactId>jinput-platform</artifactId>
+	<packaging>jar</packaging>
+	<name>JInput - Java Game Controller API</name>
+	<version>@VERSION@</version>
+	<description>JInput - Java Game Controller API</description>
+	<url>http://java.net/projects/jinput</url>
+	<licenses>
+		<license>
+			<name>BSD</name>
+			<url>http://www.opensource.org/licenses/bsd-license.php</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<id>Members</id>
+			<url>http://java.net/projects/jinput/members</url>
+		</developer>
+	</developers>
+	<scm>
+		<url>http://java.net/projects/jinput/sources/svn/show</url>
+		<connection>https://svn.java.net/svn/jinput~svn </connection>
+	</scm>
+</project>

Added: trunk/LWJGL/maven/jinput.pom
===================================================================
--- trunk/LWJGL/maven/jinput.pom	                        (rev 0)
+++ trunk/LWJGL/maven/jinput.pom	2011-02-14 20:42:15 UTC (rev 3490)
@@ -0,0 +1,52 @@
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.lwjgl.lwjgl</groupId>
+		<artifactId>parent</artifactId>
+		<version>@VERSION@</version>
+	</parent>
+	<groupId>org.lwjgl.lwjgl</groupId>
+	<artifactId>jinput</artifactId>
+	<packaging>jar</packaging>
+	<name>JInput - Java Game Controller API</name>
+	<version>@VERSION@</version>
+	<description>JInput - Java Game Controller API</description>
+	<url>http://java.net/projects/jinput</url>
+	<licenses>
+		<license>
+			<name>BSD</name>
+			<url>http://www.opensource.org/licenses/bsd-license.php</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<id>Members</id>
+			<url>http://java.net/projects/jinput/members</url>
+		</developer>
+	</developers>
+	<scm>
+		<url>http://java.net/projects/jinput/sources/svn/show</url>
+		<connection>https://svn.java.net/svn/jinput~svn </connection>
+	</scm>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jinput-platform</artifactId>
+			<version>${project.version}</version>
+			<classifier>natives-win</classifier>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jinput-platform</artifactId>
+			<version>${project.version}</version>
+			<classifier>natives-linux</classifier>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jinput-platform</artifactId>
+			<version>${project.version}</version>
+			<classifier>natives-mac</classifier>
+		</dependency>
+	</dependencies>
+</project>

Modified: trunk/LWJGL/maven/lwjgl-parent.pom
===================================================================
--- trunk/LWJGL/maven/lwjgl-parent.pom	2011-02-09 21:12:01 UTC (rev 3489)
+++ trunk/LWJGL/maven/lwjgl-parent.pom	2011-02-14 20:42:15 UTC (rev 3490)
@@ -20,8 +20,8 @@
   </scm>
   <developers>
     <developer>
-      <id>Matzon</id>
-      <name>Brian Matzon</name>
+      <id>Developers</id>
+      <url>http://lwjgl.org/credits.php</url>
     </developer>
   </developers>
 </project>

Modified: trunk/LWJGL/maven/lwjgl.pom
===================================================================
--- trunk/LWJGL/maven/lwjgl.pom	2011-02-09 21:12:01 UTC (rev 3489)
+++ trunk/LWJGL/maven/lwjgl.pom	2011-02-14 20:42:15 UTC (rev 3490)
@@ -36,5 +36,10 @@
 			<version>${project.version}</version>
 			<classifier>natives-mac</classifier>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jinput</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 	</dependencies>
 </project>

Modified: trunk/LWJGL/platform_build/build-maven.xml
===================================================================
--- trunk/LWJGL/platform_build/build-maven.xml	2011-02-09 21:12:01 UTC (rev 3489)
+++ trunk/LWJGL/platform_build/build-maven.xml	2011-02-14 20:42:15 UTC (rev 3490)
@@ -43,6 +43,7 @@
 		<antcall target="-createmavennativejars" />
 		<antcall target="-copymavenpoms"/>
 		<antcall target="-copymavendeploybuild"/>
+		<antcall target="-addjinput"/>
 		<antcall target="-copymaventdist"/>
 	</target>
 
@@ -148,6 +149,43 @@
 			</fileset>
 		</copy>
 	</target>
+	
+	<!-- JINPUT -->
+	<target name="-addjinput">
+		<antcall target="-copyjinputjar" />
+		<antcall target="-createmavennativejinputjars" />
+	</target>
+	
+	<target name="-copyjinputjar">
+		<copy todir="${lwjgl.dstMaven}">
+			<fileset dir="${lwjgl.lib}">
+				<patternset>
+					<include name="jinput.jar" />
+				</patternset>
+			</fileset>
+		</copy>
+	</target>
+	
+	
+	<target name="-createmavennativejinputjars">
+		<jar destfile="${lwjgl.dstMaven}/jinput-platform-natives-win.jar" taskname="jinput-platform-natives-win.jar">
+			<fileset dir="${lwjgl.lib}/windows">
+				<patternset refid="lwjgl-windows-jinput.fileset"/>
+			</fileset>
+		</jar>
+		<jar destfile="${lwjgl.dstMaven}/jinput-platform-natives-linux.jar" taskname="jinput-platform-natives-linux.jar">
+			<fileset dir="${lwjgl.lib}/linux">
+				<patternset refid="lwjgl-linux-jinput.fileset"/>
+			</fileset>
+		</jar>
+		<jar destfile="${lwjgl.dstMaven}/jinput-platform-natives-mac.jar" taskname="jinput-platform-natives-mac.jar">
+			<fileset dir="${lwjgl.lib}/macosx">
+				<patternset refid="lwjgl-macosx-jinput.fileset"/>
+			</fileset>
+		</jar>
+	</target>
+	
+	<!-- END JINPUT -->
 
 	<target name="-copymaventdist">
 		<zip destfile="${lwjgl.dist}/lwjgl-maven-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="maven/**" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3489
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3489&view=rev
Author:   matzon
Date:     2011-02-09 21:12:01 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
tagging 2.7.1

Added Paths:
-----------
    tags/lwjgl2.7.1/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3488
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3488&view=rev
Author:   matzon
Date:     2011-02-09 21:09:33 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
Upgrading OpenAL-Soft to latest version .. cbe288aa93de6 and moving to 2.7.1

Modified Paths:
--------------
    trunk/LWJGL/libs/linux/libopenal.so
    trunk/LWJGL/libs/linux/libopenal64.so
    trunk/LWJGL/libs/solaris/libopenal.so
    trunk/LWJGL/libs/solaris/libopenal64.so
    trunk/LWJGL/libs/windows/OpenAL32.dll
    trunk/LWJGL/libs/windows/OpenAL64.dll
    trunk/LWJGL/platform_build/build-definitions.xml
    trunk/LWJGL/src/java/org/lwjgl/Sys.java

Modified: trunk/LWJGL/libs/linux/libopenal.so
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/libs/linux/libopenal64.so
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/libs/solaris/libopenal.so
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/libs/solaris/libopenal64.so
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/libs/windows/OpenAL32.dll
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/libs/windows/OpenAL64.dll
===================================================================
(Binary files differ)

Modified: trunk/LWJGL/platform_build/build-definitions.xml
===================================================================
--- trunk/LWJGL/platform_build/build-definitions.xml	2011-02-06 21:07:30 UTC (rev 3487)
+++ trunk/LWJGL/platform_build/build-definitions.xml	2011-02-09 21:09:33 UTC (rev 3488)
@@ -12,7 +12,7 @@
 	<property name="lwjgl.docs" 				location="doc" />
 	<property name="lwjgl.temp" 				location="temp" />
 	<property name="lwjgl.res" 					location="res" />
-	<property name="lwjgl.version" 				value="2.7" />
+	<property name="lwjgl.version" 				value="2.7.1" />
 	<property name="lwjgl.web" 						location="www" />
 
 	<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/AMD*.java,org/lwjgl/opengl/APPLE*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/NVX*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java,org/lwjgl/opengl/GREMEDY*.java"/>

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2011-02-06 21:07:30 UTC (rev 3487)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2011-02-09 21:09:33 UTC (rev 3488)
@@ -54,7 +54,7 @@
 	private static final String JNI_LIBRARY_NAME = "lwjgl";
 
 	/** Current version of library */
-	private static final String VERSION = "2.7";
+	private static final String VERSION = "2.7.1";
 
 	private static final String POSTFIX64BIT = "64";
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3487
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3487&view=rev
Author:   matzon
Date:     2011-02-06 21:07:30 +0000 (Sun, 06 Feb 2011)

Log Message:
-----------
Added endolf to credits

Modified Paths:
--------------
    trunk/LWJGL/doc/CREDITS

Modified: trunk/LWJGL/doc/CREDITS
===================================================================
--- trunk/LWJGL/doc/CREDITS	2011-02-06 16:42:42 UTC (rev 3486)
+++ trunk/LWJGL/doc/CREDITS	2011-02-06 21:07:30 UTC (rev 3487)
@@ -22,6 +22,7 @@
 additional credits goes to:
  - Joseph I. Valenzuela [OpenAL stuff]
  - Lev Povalahev [OpenGL Extensions]
+ - Endolf [Nightly builds and JInput]
 
 The LWJGL project includes files from or depends on the following projects:
  - OpenGL, SGI - http://opengl.org/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3486
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3486&view=rev
Author:   matzon
Date:     2011-02-06 16:42:42 +0000 (Sun, 06 Feb 2011)

Log Message:
-----------
Tagging 2.7

Added Paths:
-----------
    tags/lwjgl2.7/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3485
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3485&view=rev
Author:   kappa1
Date:     2011-02-03 22:12:41 +0000 (Thu, 03 Feb 2011)

Log Message:
-----------
AppletLoader - another attempt to fix the logo. Thx again to arielsan for spotting issues.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-03 09:35:00 UTC (rev 3484)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-03 22:12:41 UTC (rev 3485)
@@ -1555,14 +1555,38 @@
 	 * @return the Image file
 	 */
 	protected Image getImage(String s) {
+		
+		Image image = null;
+		
 		try {
-			URL url = url = new URL(getCodeBase(), s);
-				
-			// if image failed to load, try another method
-			if (url == null) {
-				url = Thread.currentThread().getContextClassLoader().getResource(s);
-			}
+			image = getImage(new URL(getCodeBase(), s));
+		} catch (Exception e) {
+			/* */
+		}
+		
+		// if image failed to load, try another method
+		if (image == null) {
+			image = getImage(Thread.currentThread().getContextClassLoader().getResource(s));
+		}
+		
+		// if image loaded sucessfully return it
+		if (image != null) {
+			return image;
+		}
 
+		// show error as image could not be loaded
+		fatalErrorOccured("Unable to load logo and progressbar images", null);
+		return null;
+	}
+	
+	/**
+	 * Get Image from path provided
+	 *
+	 * @param url location of the image
+	 * @return the Image file
+	 */
+	public Image getImage(URL url) {
+		try {
 			Image image = super.getImage(url);
 
 			// wait for image to load
@@ -1577,13 +1601,10 @@
 		} catch (Exception e) {
 			/* */
 		}
-
-		// show error as image could not be loaded
-		fatalErrorOccured("Unable to load logo and progressbar images", null);
+		
 		return null;
 	}
 
-
 	/**
 	 * Get jar name from URL.
 	 *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3484
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3484&view=rev
Author:   kappa1
Date:     2011-02-03 09:35:00 +0000 (Thu, 03 Feb 2011)

Log Message:
-----------
AppletLoader - added small bit of missing code (doh), thx to arielsan for spotting it

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-02 22:29:18 UTC (rev 3483)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-03 09:35:00 UTC (rev 3484)
@@ -1560,7 +1560,7 @@
 				
 			// if image failed to load, try another method
 			if (url == null) {
-				Thread.currentThread().getContextClassLoader().getResource(s);
+				url = Thread.currentThread().getContextClassLoader().getResource(s);
 			}
 
 			Image image = super.getImage(url);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3483
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3483&view=rev
Author:   kappa1
Date:     2011-02-02 22:29:18 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
AppletLoader - tweak image loading to fix cases where it doesn't work

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-01-28 23:06:06 UTC (rev 3482)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-02-02 22:29:18 UTC (rev 3483)
@@ -774,7 +774,7 @@
 			// set lwjgl properties
 			setLWJGLProperties();
 
-			// switch to LWJGL Applet
+			// make applet switch on EDT as an AWT/Swing permission dialog could be called
 			EventQueue.invokeAndWait(new Runnable() {
 	            public void run() {
 					try {
@@ -1556,11 +1556,11 @@
 	 */
 	protected Image getImage(String s) {
 		try {
-			URL url = Thread.currentThread().getContextClassLoader().getResource("/"+s);
-
-			// if image not found in jar, look outside it
+			URL url = url = new URL(getCodeBase(), s);
+				
+			// if image failed to load, try another method
 			if (url == null) {
-				url = new URL(getCodeBase(), s);
+				Thread.currentThread().getContextClassLoader().getResource(s);
 			}
 
 			Image image = super.getImage(url);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.