This putback adds array offsets to the public JOGL API. The offsets are

respected and used properly in all of the public and private functions.  The
changes are in gluegen, so that the code is generated properly.  And also
throughout the parts of the jogl code that are not gluegen-generated.

For the internally generated implementation methods, a "1" is added to
the method names.  So as to not overload the public API.  This is similar
to what is already done with Buffer APIs, which have a "0" added
internally.  I used a "1" instead of a "0" to avoid any collisions of the
signatures, which could happen if a null object was sent down for the
Array (e.g., the wrong method would get called).

This should be a suitable foundation for the implementation to add the
ability to wrap arrays in Buffers, which we plan to add to the implementation
soon.

These changes will cause all existing JOGL programs to break, although
adapting them is pretty easy.  We will later be putting back changed examples
and utilities that incorporate these new APIs.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@313 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 17 insertions, 2 deletions

diff --git a/src/net/java/games/gluegen/CMethodBindingImplEmitter.java b/src/net/java/games/gluegen/CMethodBindingImplEmitter.java
index 43e4f4d86..98c5c1b4a 100644
--- a/src/net/java/games/gluegen/CMethodBindingImplEmitter.java
+++ b/src/net/java/games/gluegen/CMethodBindingImplEmitter.java
@@ -48,8 +48,11 @@ public class CMethodBindingImplEmitter extends CMethodBindingEmitter
   protected static final CommentEmitter defaultCImplCommentEmitter =
     new CImplCommentEmitter();
 
+  protected boolean arrayImplRoutine = false;
+
   public CMethodBindingImplEmitter(MethodBinding binding,
                                    boolean isOverloadedBinding,
+                                   boolean arrayImpl,
                                    String javaPackageName,
                                    String javaClassName,
                                    boolean isJavaMethodStatic,
@@ -59,13 +62,17 @@ public class CMethodBindingImplEmitter extends CMethodBindingEmitter
           javaPackageName, javaClassName,
           isJavaMethodStatic, output);
     setCommentEmitter(defaultCImplCommentEmitter);
+    arrayImplRoutine = arrayImpl;
   }
 
   protected void emitName(PrintWriter writer)
   {
     super.emitName(writer);
     if (!getIsOverloadedBinding()) {
-      writer.print("0");
+      if(!arrayImplRoutine)
+         writer.print("0");
+      else
+         writer.print("1");
     }
   }
 
@@ -76,7 +83,12 @@ public class CMethodBindingImplEmitter extends CMethodBindingEmitter
   protected String jniMangle(MethodBinding binding) {
     StringBuffer buf = new StringBuffer();
     buf.append(jniMangle(binding.getName()));
-    buf.append("0");
+
+    if(!arrayImplRoutine)
+        buf.append("0");
+    else
+        buf.append("1");
+
     buf.append("__");
     for (int i = 0; i < binding.getNumArguments(); i++) {
       JavaType type = binding.getJavaArgumentType(i);
@@ -91,6 +103,9 @@ public class CMethodBindingImplEmitter extends CMethodBindingEmitter
                        c = intArrayType.getClass();
                        jniMangle(c , buf);
        }
+       if(type.isArray() && !type.isNIOBufferArray() && !type.isStringArray())  {
+                jniMangle(Integer.TYPE, buf);
+       }
       } else {
         // FIXME: add support for char* -> String conversion
         throw new RuntimeException("Unknown kind of JavaType: name="+type.getName());