1 files changed, 17 insertions, 27 deletions
diff --git a/src/jogl/classes/javax/media/opengl/GLAutoDrawableDelegate.java b/src/jogl/classes/javax/media/opengl/GLAutoDrawableDelegate.java
index 1f6166719..76959f3f4 100644
--- a/src/jogl/classes/javax/media/opengl/GLAutoDrawableDelegate.java
+++ b/src/jogl/classes/javax/media/opengl/GLAutoDrawableDelegate.java
@@ -67,18 +67,18 @@ public class GLAutoDrawableDelegate extends GLAutoDrawableBase {
     }
     
     //
-    // make protected methods accessible
+    // expose default methods
     //
     
-    public void defaultWindowRepaintOp() {
+    public final void windowRepaintOp() {
         super.defaultWindowRepaintOp();
     }
     
-    public void defaultWindowResizedOp() {
+    public final void windowResizedOp() {
         super.defaultWindowResizedOp();
     }
     
-    public void defaultWindowDestroyNotifyOp() {
+    public final void windowDestroyNotifyOp() {
         super.defaultWindowDestroyNotifyOp();
     }
     
@@ -90,6 +90,9 @@ public class GLAutoDrawableDelegate extends GLAutoDrawableBase {
     private final Object upstreamWidget;
     
     @Override
+    protected final RecursiveLock getLock() { return lock; }
+    
+    @Override
     public final Object getUpstreamWidget() {
         return upstreamWidget;
     }
@@ -97,39 +100,21 @@ public class GLAutoDrawableDelegate extends GLAutoDrawableBase {
     /**
      * {@inheritDoc}
      * <p>
-     * This implementation calls {@link #defaultDestroyOp()}.
+     * This implementation calls {@link #defaultDestroy()}.
      * </p>
      * <p>
      * User still needs to destroy the upstream window, which details are hidden from this aspect.
+     * This can be performed by overriding {@link #destroyImplInLock()}. 
      * </p>
      */
     @Override
-    public void destroy() {
-        lock.lock();
-        try {
-            defaultDestroyOp();
-        } finally {
-            lock.unlock();
-        }
+    public final void destroy() {
+        defaultDestroy();
     }
 
     @Override
     public void display() {
-        if( sendDestroy ) {
-            sendDestroy=false;
-            destroy();
-            return;
-        }
-        
-        lock.lock(); // sync: context/drawable could been recreated/destroyed while animating
-        try {
-            if( null != drawable && drawable.isRealized() && null != context ) {
-                // surface is locked/unlocked implicit by context's makeCurrent/release
-                helper.invokeGL(drawable, context, defaultDisplayAction, defaultInitAction);
-            }
-        } finally {
-            lock.unlock();
-        }
+        defaultDisplay();
     }
     
     //
@@ -145,4 +130,9 @@ public class GLAutoDrawableDelegate extends GLAutoDrawableBase {
     public final void setRealized(boolean realized) {
     }
 
+    @Override
+    public final void swapBuffers() throws GLException {
+         defaultSwapBuffers();
+    }
+        
 }