From f3e05fe62b91134ac601520c6f9c44d6d31fcd86 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 11 Nov 2011 06:02:30 +0100
Subject: Revert introduction of NativeSurfaceHolder and NativeWindowHolder
 interfaces

I was too fast introducing these accessors, since they are currently not needed
and hence redundant.

Complete
- 7bc4c218b47033cb66f4eb5e707a86a0a4e60cff

Partial in regards to the holder interfaces only:
- d8fa00d35a49f4faf5f04aeb7e2bba4e972965f5
- f51e3dad6c4bd1f6d0001cecf6a0f692400ed602
- 46542168d64b37f544f61802693f15b59b224e4e
---
 src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java |  8 +-------
 src/newt/classes/com/jogamp/newt/opengl/GLWindow.java   | 16 +---------------
 src/newt/classes/jogamp/newt/WindowImpl.java            |  8 --------
 3 files changed, 2 insertions(+), 30 deletions(-)

(limited to 'src/newt/classes')

diff --git a/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java b/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java
index 126ee5289..1ce8f09ca 100644
--- a/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java
+++ b/src/newt/classes/com/jogamp/newt/awt/NewtCanvasAWT.java
@@ -40,11 +40,8 @@ import java.security.PrivilegedAction;
 
 import javax.media.nativewindow.Capabilities;
 import javax.media.nativewindow.CapabilitiesImmutable;
-import javax.media.nativewindow.NativeSurface;
-import javax.media.nativewindow.NativeSurfaceHolder;
 import javax.media.nativewindow.NativeWindow;
 import javax.media.nativewindow.NativeWindowException;
-import javax.media.nativewindow.NativeWindowHolder;
 import javax.media.nativewindow.WindowClosingProtocol;
 import javax.media.nativewindow.awt.AWTWindowClosingProtocol;
 import javax.swing.MenuSelectionManager;
@@ -64,7 +61,7 @@ import com.jogamp.newt.event.awt.AWTKeyAdapter;
 import com.jogamp.newt.event.awt.AWTMouseAdapter;
 
 @SuppressWarnings("serial")
-public class NewtCanvasAWT extends java.awt.Canvas implements WindowClosingProtocol, NativeSurfaceHolder, NativeWindowHolder {
+public class NewtCanvasAWT extends java.awt.Canvas implements WindowClosingProtocol {
     public static final boolean DEBUG = Debug.debug("Window");
 
     NativeWindow nativeWindow = null;
@@ -200,9 +197,6 @@ public class NewtCanvasAWT extends java.awt.Canvas implements WindowClosingProto
      * or {@link #addNotify()} hasn't been called yet.*/
     public NativeWindow getNativeWindow() { return nativeWindow; }
     
-    /** See {@link #getNativeWindow()} */    
-    public NativeSurface getNativeSurface() { return nativeWindow; }
-
     public int getDefaultCloseOperation() {
         return awtWindowClosingProtocol.getDefaultCloseOperation();
     }
diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
index 51a2aa73b..e9ac272c8 100644
--- a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
+++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java
@@ -195,10 +195,6 @@ public class GLWindow implements GLAutoDrawable, Window, NEWTEventConsumer, FPSC
         return window.getRequestedCapabilities();
     }
 
-    public NativeWindow getNativeWindow() {
-        return window;
-    }
-    
     public final Window getWindow() {
         return window;
     }
@@ -680,18 +676,8 @@ public class GLWindow implements GLAutoDrawable, Window, NEWTEventConsumer, FPSC
     // GLDrawable methods
     //
 
-
-    /**
-     * {@inheritDoc} 
-     * <p>
-     * Be aware that the returned NativeSurface may change.
-     * If this inner {@link GLDrawable} representation became realized (see {@link #isRealized()})
-     * this {@link GLDrawable}'s {@link NativeSurface} instance is being returned.
-     * Otherwise this {@link Window} {@link NativeSurface}'s is being returned.
-     * </p>
-     */
     public final NativeSurface getNativeSurface() {
-        return null!=drawable ? drawable.getNativeSurface() : window.getNativeSurface();
+        return null!=drawable ? drawable.getNativeSurface() : null;
     }
 
     public final long getHandle() {
diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java
index 180cd568e..e8d6997c2 100644
--- a/src/newt/classes/jogamp/newt/WindowImpl.java
+++ b/src/newt/classes/jogamp/newt/WindowImpl.java
@@ -538,10 +538,6 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
     // NativeSurface
     //
 
-    public NativeSurface getNativeSurface() {
-        return this;
-    }
-    
     public final int lockSurface() {
         windowLock.lock();
         surfaceLock.lock();
@@ -634,10 +630,6 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
     // NativeWindow
     //
 
-    public NativeWindow getNativeWindow() {
-        return this;
-    }
-    
     // public final void destroy() - see below
 
     public final NativeWindow getParent() {
-- 
cgit v1.2.3