diff options
author | Kenneth Russel <[email protected]> | 2009-03-17 21:07:26 +0000 |
---|---|---|
committer | Kenneth Russel <[email protected]> | 2009-03-17 21:07:26 +0000 |
commit | 40c18b4e195aca93e981a2b5393ddaa6983599d2 (patch) | |
tree | cba01877447486cc8ba3e05a637d1b8456535544 /src/jogl/classes/com/sun/opengl/impl/x11/glx | |
parent | 9a44770462cc3e10af1eee66a75e708bd540fce9 (diff) |
Finish (?) moving javax.media.nwi -> javax.media.nativewindow
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1882 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/jogl/classes/com/sun/opengl/impl/x11/glx')
13 files changed, 37 insertions, 37 deletions
diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/GLXUtil.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/GLXUtil.java index 800396502..7b4165ba2 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/GLXUtil.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/GLXUtil.java @@ -35,9 +35,9 @@ package com.sun.opengl.impl.x11.glx; import javax.media.opengl.*; import com.sun.opengl.impl.*; -import javax.media.nwi.NativeWindowFactory; -import com.sun.nwi.impl.NullWindow; -import com.sun.nwi.impl.x11.*; +import javax.media.nativewindow.NativeWindowFactory; +import com.sun.nativewindow.impl.NullWindow; +import com.sun.nativewindow.impl.x11.*; public class GLXUtil { private static final boolean DEBUG = Debug.debug("GLXUtil"); diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXContext.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXContext.java index 02eff5d3e..c68827862 100755 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXContext.java @@ -39,11 +39,11 @@ package com.sun.opengl.impl.x11.glx; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; -import com.sun.nwi.impl.NullWindow; -import com.sun.nwi.impl.x11.*; +import com.sun.nativewindow.impl.NullWindow; +import com.sun.nativewindow.impl.x11.*; public class X11ExternalGLXContext extends X11GLXContext { private boolean firstMakeCurrent = true; diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java index 9d5331b9c..2629b2362 100755 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11ExternalGLXDrawable.java @@ -39,11 +39,11 @@ package com.sun.opengl.impl.x11.glx; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; -import com.sun.nwi.impl.NullWindow; -import com.sun.nwi.impl.x11.*; +import com.sun.nativewindow.impl.NullWindow; +import com.sun.nativewindow.impl.x11.*; import java.nio.LongBuffer; diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java index 7f39db2af..ffc09fefe 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXContext.java @@ -41,11 +41,11 @@ package com.sun.opengl.impl.x11.glx; import java.nio.*; import java.util.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.opengl.impl.x11.glx.*; -import com.sun.nwi.impl.x11.*; +import com.sun.nativewindow.impl.x11.*; import com.sun.gluegen.runtime.ProcAddressTable; public abstract class X11GLXContext extends GLContextImpl { diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java index 9f7b62dae..2f1f777c9 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java @@ -39,10 +39,10 @@ package com.sun.opengl.impl.x11.glx; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; -import com.sun.nwi.impl.x11.*; +import com.sun.nativewindow.impl.x11.*; public abstract class X11GLXDrawable extends GLDrawableImpl { protected static final boolean DEBUG = Debug.debug("X11GLXDrawable"); diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java index 170710633..a0c3a7758 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawableFactory.java @@ -39,14 +39,14 @@ package com.sun.opengl.impl.x11.glx; import java.nio.*; import java.security.*; import java.util.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.gluegen.runtime.*; import com.sun.gluegen.runtime.opengl.*; import com.sun.opengl.impl.*; import com.sun.opengl.impl.x11.glx.*; -import com.sun.nwi.impl.NullWindow; -import com.sun.nwi.impl.x11.*; +import com.sun.nativewindow.impl.NullWindow; +import com.sun.nativewindow.impl.x11.*; public class X11GLXDrawableFactory extends GLDrawableFactoryImpl { protected static final boolean DEBUG = Debug.debug("X11GLXDrawableFactory"); diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXNativeWindowFactory.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXNativeWindowFactory.java index f6c5a590f..3944f4180 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXNativeWindowFactory.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11GLXNativeWindowFactory.java @@ -32,12 +32,12 @@ package com.sun.opengl.impl.x11.glx; -import javax.media.nwi.*; -import javax.media.nwi.x11.X11GraphicsDevice; -import javax.media.nwi.x11.X11GraphicsConfiguration; -import com.sun.nwi.impl.NullWindow; -import com.sun.nwi.impl.NativeWindowFactoryImpl; -import com.sun.nwi.impl.x11.*; +import javax.media.nativewindow.*; +import javax.media.nativewindow.x11.X11GraphicsDevice; +import javax.media.nativewindow.x11.X11GraphicsConfiguration; +import com.sun.nativewindow.impl.NullWindow; +import com.sun.nativewindow.impl.NativeWindowFactoryImpl; +import com.sun.nativewindow.impl.x11.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; @@ -52,7 +52,7 @@ import com.sun.opengl.impl.x11.glx.*; public class X11GLXNativeWindowFactory extends NativeWindowFactoryImpl { public X11GLXNativeWindowFactory() { - NativeWindowFactory.registerFactory(javax.media.nwi.NativeWindow.class, this); + NativeWindowFactory.registerFactory(javax.media.nativewindow.NativeWindow.class, this); } public AbstractGraphicsConfiguration chooseGraphicsConfiguration(NWCapabilities capabilities, diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java index 9b3dd98b3..46712bced 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java @@ -39,11 +39,11 @@ package com.sun.opengl.impl.x11.glx; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; -import com.sun.nwi.impl.NullWindow; -import com.sun.nwi.impl.x11.*; +import com.sun.nativewindow.impl.NullWindow; +import com.sun.nativewindow.impl.x11.*; public class X11OffscreenGLXDrawable extends X11GLXDrawable { private long pixmap; diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXContext.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXContext.java index ed6b4018e..9da86205d 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXContext.java @@ -41,7 +41,7 @@ package com.sun.opengl.impl.x11.glx; import java.util.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.opengl.impl.x11.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java index ee92b82f2..5c1a5071c 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11OnscreenGLXDrawable.java @@ -39,7 +39,7 @@ package com.sun.opengl.impl.x11.glx; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.opengl.impl.x11.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXContext.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXContext.java index a858935fc..c4f0d4332 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXContext.java @@ -39,7 +39,7 @@ package com.sun.opengl.impl.x11.glx; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.opengl.impl.x11.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXDrawable.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXDrawable.java index 4d7b2e5d5..99aebb4ed 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/X11PbufferGLXDrawable.java @@ -39,12 +39,12 @@ package com.sun.opengl.impl.x11.glx; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.opengl.impl.x11.glx.*; -import com.sun.nwi.impl.NullWindow; -import com.sun.nwi.impl.x11.*; +import com.sun.nativewindow.impl.NullWindow; +import com.sun.nativewindow.impl.x11.*; import java.nio.LongBuffer; diff --git a/src/jogl/classes/com/sun/opengl/impl/x11/glx/awt/X11AWTGLXNativeWindowFactory.java b/src/jogl/classes/com/sun/opengl/impl/x11/glx/awt/X11AWTGLXNativeWindowFactory.java index 34a6a6fa1..4029d90bd 100644 --- a/src/jogl/classes/com/sun/opengl/impl/x11/glx/awt/X11AWTGLXNativeWindowFactory.java +++ b/src/jogl/classes/com/sun/opengl/impl/x11/glx/awt/X11AWTGLXNativeWindowFactory.java @@ -35,15 +35,15 @@ package com.sun.opengl.impl.x11.glx.awt; import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; -import javax.media.nwi.*; -import javax.media.nwi.awt.AWTGraphicsDevice; -import javax.media.nwi.awt.AWTGraphicsConfiguration; +import javax.media.nativewindow.*; +import javax.media.nativewindow.awt.AWTGraphicsDevice; +import javax.media.nativewindow.awt.AWTGraphicsConfiguration; import javax.media.opengl.*; import javax.media.opengl.awt.*; import com.sun.opengl.impl.*; -import com.sun.nwi.impl.jawt.*; -import com.sun.nwi.impl.jawt.x11.*; +import com.sun.nativewindow.impl.jawt.*; +import com.sun.nativewindow.impl.jawt.x11.*; import com.sun.opengl.impl.x11.*; import com.sun.opengl.impl.x11.glx.*; |