GLContextImpl: GLContextLock -> RecursiveLock

RecursiveLock maintains a queue of waiting Threads,
ensuring the longest waiting thread will be notified at unlock.

Delete GLContextLock.

Cleanup HashMap generics style.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
index 2a2fba8bd..db737902a 100644
--- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java
@@ -82,9 +82,9 @@ public abstract class MacOSXCGLContext extends GLContextImpl
     return cglExtProcAddressTable;
   }
 
-  protected Map/*<String, String>*/ getFunctionNameMap() { return null; }
+  protected Map<String, String> getFunctionNameMap() { return null; }
 
-  protected Map/*<String, String>*/ getExtensionNameMap() { return null; }
+  protected Map<String, String> getExtensionNameMap() { return null; }
 
   protected long createContextARBImpl(long share, boolean direct, int ctp, int major, int minor) {
       return 0; // FIXME
@@ -230,12 +230,12 @@ public abstract class MacOSXCGLContext extends GLContextImpl
     if (DEBUG) {
       System.err.println(getThreadName() + ": !!! Initializing CGL extension address table: "+key);
     }
-    CGLExtProcAddressTable table = null;
+    ProcAddressTable table = null;
     synchronized(mappedContextTypeObjectLock) {
-        table = (CGLExtProcAddressTable) mappedGLXProcAddress.get( key );
+        table = mappedGLXProcAddress.get( key );
     }
     if(null != table) {
-        cglExtProcAddressTable = table;
+        cglExtProcAddressTable = (CGLExtProcAddressTable) table;
         if(DEBUG) {
             System.err.println(getThreadName() + ": !!! GLContext CGL ProcAddressTable reusing key("+key+") -> "+table.hashCode());
         }