aboutsummaryrefslogtreecommitdiffstats
path: root/src/nativewindow/classes/jogamp
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-11-11 06:02:30 +0100
committerSven Gothel <[email protected]>2011-11-11 06:02:30 +0100
commitf3e05fe62b91134ac601520c6f9c44d6d31fcd86 (patch)
tree3e013fb53f9e65c63e885acad23c52692889322b /src/nativewindow/classes/jogamp
parent3a6f6fd237505e8ced20b64579cca42e61751c51 (diff)
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
Diffstat (limited to 'src/nativewindow/classes/jogamp')
-rw-r--r--src/nativewindow/classes/jogamp/nativewindow/WrappedSurface.java5
-rw-r--r--src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java8
-rw-r--r--src/nativewindow/classes/jogamp/nativewindow/windows/GDISurface.java5
3 files changed, 0 insertions, 18 deletions
diff --git a/src/nativewindow/classes/jogamp/nativewindow/WrappedSurface.java b/src/nativewindow/classes/jogamp/nativewindow/WrappedSurface.java
index c4c33707d..65ecc48fe 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/WrappedSurface.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/WrappedSurface.java
@@ -29,7 +29,6 @@
package jogamp.nativewindow;
import javax.media.nativewindow.AbstractGraphicsConfiguration;
-import javax.media.nativewindow.NativeSurface;
import javax.media.nativewindow.ProxySurface;
import javax.media.nativewindow.SurfaceChangeable;
@@ -50,10 +49,6 @@ public class WrappedSurface extends ProxySurface implements SurfaceChangeable {
surfaceHandle = 0;
}
- public NativeSurface getNativeSurface() {
- return this;
- }
-
public long getSurfaceHandle() {
return surfaceHandle;
}
diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java
index 109ae020f..efd3522b8 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/JAWTWindow.java
@@ -165,10 +165,6 @@ public abstract class JAWTWindow implements NativeWindow {
// NativeSurface
//
- public NativeSurface getNativeSurface() {
- return this;
- }
-
private RecursiveLock surfaceLock = LockFactory.createRecursiveLock();
protected abstract int lockSurfaceImpl() throws NativeWindowException;
@@ -258,10 +254,6 @@ public abstract class JAWTWindow implements NativeWindow {
// NativeWindow
//
- public NativeWindow getNativeWindow() {
- return this;
- }
-
public synchronized void destroy() {
invalidate();
if(null!=component) {
diff --git a/src/nativewindow/classes/jogamp/nativewindow/windows/GDISurface.java b/src/nativewindow/classes/jogamp/nativewindow/windows/GDISurface.java
index bf3b649cf..68cf8af45 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/windows/GDISurface.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/windows/GDISurface.java
@@ -29,7 +29,6 @@
package jogamp.nativewindow.windows;
import javax.media.nativewindow.AbstractGraphicsConfiguration;
-import javax.media.nativewindow.NativeSurface;
import javax.media.nativewindow.NativeWindowException;
import javax.media.nativewindow.ProxySurface;
@@ -57,10 +56,6 @@ public class GDISurface extends ProxySurface {
surfaceHandle=0;
}
- public NativeSurface getNativeSurface() {
- return this;
- }
-
protected int lockSurfaceImpl() {
if (0 != surfaceHandle) {
throw new InternalError("surface not released");