Fixed nested toolkit locking problem with X11PbufferGLXDrawable. With

this fix pbuffers and the GLJPanel are working again on X11 platforms.

Moved lockToolkit, unlockToolkit and isToolkitLocked from
GLDrawableFactory to GLDrawableFactoryImpl. Updated all call sites.


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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java b/src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
index 3444bd57a..b11e0f275 100644
--- a/src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java
@@ -68,7 +68,7 @@ public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
   }
 
   public void destroy() {
-    getFactory().lockToolkit();
+    getFactoryImpl().lockToolkit();
     try {
         if (this.pBuffer != 0) {
           impl.destroy(pBuffer);
@@ -78,7 +78,7 @@ public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
           }
         }
     } finally {
-        getFactory().unlockToolkit();
+        getFactoryImpl().unlockToolkit();
     }
     super.destroy();
   }
@@ -99,7 +99,7 @@ public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
 
   private void createPbuffer() {
     NullWindow nw = (NullWindow) getNativeWindow();
-    getFactory().lockToolkit();
+    getFactoryImpl().lockToolkit();
     try {
         int renderTarget;
         GLCapabilities capabilities = getRequestedGLCapabilities();
@@ -139,7 +139,7 @@ public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
           throw new GLException("pbuffer creation error: CGL.createPBuffer() failed");
         }
     } finally {
-        getFactory().unlockToolkit();
+        getFactoryImpl().unlockToolkit();
     }
         
     if (DEBUG) {