java-game-lib-cvs

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3400] trunk/LWJGL/src/java/org/lwjgl/util/ generator/JavaMethodsGenerator.java

[<sp...@us...>]

Revision: 3400
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3400&view=rev
Author:   spasi
Date:     2010-08-16 22:09:01 +0000 (Mon, 16 Aug 2010)

Log Message:
-----------
Fixed NPE when safeNewBuffer returns NULL.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2010-07-31 16:14:13 UTC (rev 3399)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2010-08-16 22:09:01 UTC (rev 3400)
@@ -263,7 +263,7 @@
 		if (has_result) {
 			if ( method.getAnnotation(GLreturn.class) == null ) {
 				if ( ByteBuffer.class.equals(Utils.getJavaType(result_type)) )
-					writer.println("\t\treturn " + Utils.RESULT_VAR_NAME + ".order(ByteOrder.nativeOrder());"); // safeNewBuffer returns a direct ByteBuffer with BIG_ENDIAN order.
+					writer.println("\t\treturn " + Utils.RESULT_VAR_NAME + " == null ? null : " + Utils.RESULT_VAR_NAME + ".order(ByteOrder.nativeOrder());"); // safeNewBuffer returns a direct ByteBuffer with BIG_ENDIAN order.
 				else
 					writer.println("\t\treturn " + Utils.RESULT_VAR_NAME + ";");
 			} else


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3401] trunk/LWJGL/src/java/org/lwjgl/util/ generator/JavaMethodsGenerator.java

[<sp...@us...>]

Revision: 3401
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3401&view=rev
Author:   spasi
Date:     2010-08-16 22:18:33 +0000 (Mon, 16 Aug 2010)

Log Message:
-----------


Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2010-08-16 22:09:01 UTC (rev 3400)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2010-08-16 22:18:33 UTC (rev 3401)
@@ -263,7 +263,7 @@
 		if (has_result) {
 			if ( method.getAnnotation(GLreturn.class) == null ) {
 				if ( ByteBuffer.class.equals(Utils.getJavaType(result_type)) )
-					writer.println("\t\treturn " + Utils.RESULT_VAR_NAME + " == null ? null : " + Utils.RESULT_VAR_NAME + ".order(ByteOrder.nativeOrder());"); // safeNewBuffer returns a direct ByteBuffer with BIG_ENDIAN order.
+					writer.println("\t\treturn LWJGLUtil.CHECKS && " + Utils.RESULT_VAR_NAME + " == null ? null : " + Utils.RESULT_VAR_NAME + ".order(ByteOrder.nativeOrder());"); // safeNewBuffer returns a direct ByteBuffer with BIG_ENDIAN order.
 				else
 					writer.println("\t\treturn " + Utils.RESULT_VAR_NAME + ";");
 			} else


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

[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3454] trunk/LWJGL/src/java/org/lwjgl/util/ generator/JavaMethodsGenerator.java

[<sp...@us...>]

Revision: 3454
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3454&view=rev
Author:   spasi
Date:     2010-11-05 17:13:56 +0000 (Fri, 05 Nov 2010)

Log Message:
-----------
Fixed @Reuse + @BufferObject generation.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2010-10-28 21:39:55 UTC (rev 3453)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java	2010-11-05 17:13:56 UTC (rev 3454)
@@ -75,19 +75,19 @@
 			printMethodWithMultiType(env, type_map, writer, interface_decl, method, TypeInfo.getDefaultTypeInfoMap(method), Mode.CACHEDRESULT, generate_error_checks, context_specific);
 		}
 
-		// Skip the native function if we're re-using.
 		Reuse reuse_annotation = method.getAnnotation(Reuse.class);
-		if ( reuse_annotation != null )
-			return;
-
 		Alternate alt_annotation = method.getAnnotation(Alternate.class);
 		if ( alt_annotation == null || (alt_annotation.nativeAlt() && !alt_annotation.skipNative()) ) {
 			if ( alt_annotation != null && method.getSimpleName().equals(alt_annotation.value()) )
 				throw new RuntimeException("An alternate function with native code should have a different name than the main function.");
-			printJavaNativeStub(writer, method, Mode.NORMAL, generate_error_checks, context_specific);
+
+			if ( reuse_annotation == null )
+				printJavaNativeStub(writer, method, Mode.NORMAL, generate_error_checks, context_specific);
+
 			if (Utils.hasMethodBufferObjectParameter(method)) {
 				printMethodWithMultiType(env, type_map, writer, interface_decl, method, TypeInfo.getDefaultTypeInfoMap(method), Mode.BUFFEROBJECT, generate_error_checks, context_specific);
-				printJavaNativeStub(writer, method, Mode.BUFFEROBJECT, generate_error_checks, context_specific);
+				if ( reuse_annotation == null )
+					printJavaNativeStub(writer, method, Mode.BUFFEROBJECT, generate_error_checks, context_specific);
 			}
 		}
 	}


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