Fixed bug in handling of ignores of ARB extensions caused by

canonicalization of names, which was exposed by trying to ignore
WGL_OML_sync_control. Made static uniqNameMap from JavaConfiguration
an instance variable and propagated this throughout the code.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/gluegen/branches/JOGL_2_SANDBOX@107 a78bb65f-1512-4460-ba86-f6dc96a7bf27

1 files changed, 8 insertions, 2 deletions

diff --git a/src/java/com/sun/gluegen/JavaMethodBindingEmitter.java b/src/java/com/sun/gluegen/JavaMethodBindingEmitter.java
index 0b33110..525ff52 100644
--- a/src/java/com/sun/gluegen/JavaMethodBindingEmitter.java
+++ b/src/java/com/sun/gluegen/JavaMethodBindingEmitter.java
@@ -93,6 +93,9 @@ public class JavaMethodBindingEmitter extends FunctionEmitter
   // represent an array of compound type wrappers
   private static final String COMPOUND_ARRAY_SUFFIX = "_buf_array_copy";
 
+  // Only present to provide more clear comments
+  private JavaConfiguration cfg;
+
   public JavaMethodBindingEmitter(MethodBinding binding,
                                   PrintWriter output,
                                   String runtimeExceptionType,
@@ -105,7 +108,8 @@ public class JavaMethodBindingEmitter extends FunctionEmitter
                                   boolean forDirectBufferImplementation,
                                   boolean forIndirectBufferAndArrayImplementation,
                                   boolean isUnimplemented,
-                                  boolean isInterface)
+                                  boolean isInterface,
+                                  JavaConfiguration configuration)
   {
     super(output, isInterface);
     this.binding = binding;
@@ -124,6 +128,7 @@ public class JavaMethodBindingEmitter extends FunctionEmitter
     } else {
       setCommentEmitter(defaultInterfaceCommentEmitter);
     }
+    cfg = configuration;
   }
   
   public JavaMethodBindingEmitter(JavaMethodBindingEmitter arg) {
@@ -142,6 +147,7 @@ public class JavaMethodBindingEmitter extends FunctionEmitter
     prologue                      = arg.prologue;
     epilogue                      = arg.epilogue;
     returnedArrayLengthExpression = arg.returnedArrayLengthExpression;
+    cfg                           = arg.cfg;
   }
 
   public final MethodBinding getBinding() { return binding; }
@@ -784,7 +790,7 @@ public class JavaMethodBindingEmitter extends FunctionEmitter
       writer.print("Entry point to C language function: ");
     }
     protected void emitBindingCSignature(MethodBinding binding, PrintWriter writer) {      
-      UnifiedName uniName = (UnifiedName) JavaConfiguration.getUniqNameMap().get(binding.getCSymbol().getName());
+      UnifiedName uniName = (UnifiedName) cfg.getUniqNameMap().get(binding.getCSymbol().getName());
       if(null!=uniName) {
           writer.print("- Alias for: <br> <code> ");
           writer.print(binding.getCSymbol().getType().toString(uniName.getOrigStringList(", "), tagNativeBinding));