Menu
▾
▴
[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2768] trunk/LWJGL/src/java/org/lwjgl
|
From: <eli...@us...> - 2007-04-15 19:43:37
|
Revision: 2768
http://svn.sourceforge.net/java-game-lib/?rev=2768&view=rev
Author: elias_naur
Date: 2007-04-15 12:43:35 -0700 (Sun, 15 Apr 2007)
Log Message:
-----------
Move null parameter checks from check classes to the generated classes, since calculateImageSize assumes the buffer being non-null
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java
trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
Modified: trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java 2007-04-15 19:33:03 UTC (rev 2767)
+++ trunk/LWJGL/src/java/org/lwjgl/BufferChecks.java 2007-04-15 19:43:35 UTC (rev 2768)
@@ -85,45 +85,6 @@
}
/**
- * Helper methods to ensure a buffer is direct or null.
- */
- public static void checkDirectOrNull(ByteBuffer buf) {
- if (buf != null) {
- checkDirect(buf);
- }
- }
-
- public static void checkDirectOrNull(ShortBuffer buf) {
- if (buf != null) {
- checkDirect(buf);
- }
- }
-
- public static void checkDirectOrNull(IntBuffer buf) {
- if (buf != null) {
- checkDirect(buf);
- }
- }
-
- public static void checkDirectOrNull(LongBuffer buf) {
- if (buf != null) {
- checkDirect(buf);
- }
- }
-
- public static void checkDirectOrNull(FloatBuffer buf) {
- if (buf != null) {
- checkDirect(buf);
- }
- }
-
- public static void checkDirectOrNull(DoubleBuffer buf) {
- if (buf != null) {
- checkDirect(buf);
- }
- }
-
- /**
* Helper methods to ensure a buffer is direct (and, implicitly, non-null).
*/
public static void checkDirect(ByteBuffer buf) {
@@ -214,43 +175,4 @@
checkBufferSize(buf, size);
checkDirect(buf);
}
-
- /**
- * Helper methods to ensure a buffer is direct, has a minimum size or null.
- */
- public static void checkBufferOrNull(ByteBuffer buf, int size) {
- if (buf != null) {
- checkBuffer(buf, size);
- }
- }
-
- public static void checkBufferOrNull(ShortBuffer buf, int size) {
- if (buf != null) {
- checkBuffer(buf, size);
- }
- }
-
- public static void checkBufferOrNull(IntBuffer buf, int size) {
- if (buf != null) {
- checkBuffer(buf, size);
- }
- }
-
- public static void checkBufferOrNull(LongBuffer buf, int size) {
- if (buf != null) {
- checkBuffer(buf, size);
- }
- }
-
- public static void checkBufferOrNull(FloatBuffer buf, int size) {
- if (buf != null) {
- checkBuffer(buf, size);
- }
- }
-
- public static void checkBufferOrNull(DoubleBuffer buf, int size) {
- if (buf != null) {
- checkBuffer(buf, size);
- }
- }
}
Modified: trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java 2007-04-15 19:33:03 UTC (rev 2767)
+++ trunk/LWJGL/src/java/org/lwjgl/NondirectBufferWrapper.java 2007-04-15 19:43:35 UTC (rev 2768)
@@ -67,42 +67,6 @@
return buffers;
}
- public static ByteBuffer wrapBufferOrNull(ByteBuffer buf, int size) {
- if (buf != null)
- return wrapBuffer(buf, size);
- return buf;
- }
-
- public static ShortBuffer wrapBufferOrNull(ShortBuffer buf, int size) {
- if (buf != null)
- return wrapBuffer(buf, size);
- return buf;
- }
-
- public static IntBuffer wrapBufferOrNull(IntBuffer buf, int size) {
- if (buf != null)
- return wrapBuffer(buf, size);
- return buf;
- }
-
- public static LongBuffer wrapBufferOrNull(LongBuffer buf, int size) {
- if (buf != null)
- return wrapBuffer(buf, size);
- return buf;
- }
-
- public static FloatBuffer wrapBufferOrNull(FloatBuffer buf, int size) {
- if (buf != null)
- return wrapBuffer(buf, size);
- return buf;
- }
-
- public static DoubleBuffer wrapBufferOrNull(DoubleBuffer buf, int size) {
- if (buf != null)
- return wrapBuffer(buf, size);
- return buf;
- }
-
public static ByteBuffer wrapBuffer(ByteBuffer buf, int size) {
BufferChecks.checkBufferSize(buf, size);
return wrapDirect(buf);
@@ -133,42 +97,6 @@
return wrapDirect(buf);
}
- public static ByteBuffer wrapDirectOrNull(ByteBuffer buffer) {
- if (buffer != null)
- return wrapDirect(buffer);
- return buffer;
- }
-
- public static ShortBuffer wrapDirectOrNull(ShortBuffer buffer) {
- if (buffer != null)
- return wrapDirect(buffer);
- return buffer;
- }
-
- public static FloatBuffer wrapDirectOrNull(FloatBuffer buffer) {
- if (buffer != null)
- return wrapDirect(buffer);
- return buffer;
- }
-
- public static IntBuffer wrapDirectOrNull(IntBuffer buffer) {
- if (buffer != null)
- return wrapDirect(buffer);
- return buffer;
- }
-
- public static LongBuffer wrapDirectOrNull(LongBuffer buffer) {
- if (buffer != null)
- return wrapDirect(buffer);
- return buffer;
- }
-
- public static DoubleBuffer wrapDirectOrNull(DoubleBuffer buffer) {
- if (buffer != null)
- return wrapDirect(buffer);
- return buffer;
- }
-
public static ByteBuffer wrapDirect(ByteBuffer buffer) {
if (!buffer.isDirect())
return doWrap(buffer);
Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java 2007-04-15 19:33:03 UTC (rev 2767)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java 2007-04-15 19:43:35 UTC (rev 2768)
@@ -438,20 +438,18 @@
}
private static void printParameterCheck(PrintWriter writer, String name, String check_value, boolean can_be_null, boolean null_terminated, boolean indirect_buffer_allowed) {
+ if (can_be_null) {
+ writer.println("\t\tif (" + name + " != null)");
+ writer.print("\t");
+ }
if (indirect_buffer_allowed)
writer.print("\t\t" + name + " = NondirectBufferWrapper.wrap");
else
writer.print("\t\tBufferChecks.check");
if (check_value != null && !"".equals(check_value) ) {
- writer.print("Buffer");
- if (can_be_null)
- writer.print("OrNull");
- writer.print("(" + name + ", " + check_value);
+ writer.print("Buffer(" + name + ", " + check_value);
} else {
- writer.print("Direct");
- if (can_be_null)
- writer.print("OrNull");
- writer.print("(" + name);
+ writer.print("Direct(" + name);
}
writer.println(");");
if (null_terminated)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
