diff options
71 files changed, 138 insertions, 138 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml index 945be16a0..e8349b49d 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -184,7 +184,7 @@ <property name="rootrel.obj" value="${rootrel.build.newt}/obj" /> <property name="gluegen-rt.jar" value="../../gluegen/${rootrel.build}/gluegen-rt.jar" /> - <property name="nwi.all.jar" value="../${rootrel.build}-nwi/nwi.all.jar" /> + <property name="nativewindow.all.jar" value="../${rootrel.build}-nativewindow/nativewindow.all.jar" /> <property name="jogl.all.jar" value="../${rootrel.build}-jogl/jogl.all.jar" /> <!-- The source directories. --> @@ -200,8 +200,8 @@ <property name="classes" value="${build}/classes" /> <property name="obj" value="${project.root}/${rootrel.obj}" /> - <path id="nwigluegenjogl.classpath"> - <pathelement location="${nwi.all.jar}" /> + <path id="nativewindow_gluegen_jogl.classpath"> + <pathelement location="${nativewindow.all.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${jogl.all.jar}" /> </path> @@ -259,7 +259,7 @@ fork="yes" memoryMaximumSize="128m" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> - <classpath refid="nwigluegenjogl.classpath"/> + <classpath refid="nativewindow_gluegen_jogl.classpath"/> <src path="${src.java}" /> </javac> </target> @@ -273,7 +273,7 @@ memoryMaximumSize="128m" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src.java}" /> - <classpath refid="nwigluegenjogl.classpath"/> + <classpath refid="nativewindow_gluegen_jogl.classpath"/> </javac> </target> @@ -613,7 +613,7 @@ source="1.4" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > - <classpath refid="nwigluegenjogl.classpath"/> + <classpath refid="nativewindow_gluegen_jogl.classpath"/> </javadoc> </target> @@ -627,7 +627,7 @@ source="1.4" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > - <classpath refid="nwigluegenjogl.classpath"/> + <classpath refid="nativewindow_gluegen_jogl.classpath"/> </javadoc> </target> @@ -641,7 +641,7 @@ source="1.4" linkoffline="${javadoc.link} 142-packages" bottom="${javadoc.bottom}" > - <classpath refid="nwigluegenjogl.classpath"/> + <classpath refid="nativewindow_gluegen_jogl.classpath"/> </javadoc> </target> diff --git a/make/config/jogl/glu-common.cfg b/make/config/jogl/glu-common.cfg index 06f80342e..a21cfe9c6 100644 --- a/make/config/jogl/glu-common.cfg +++ b/make/config/jogl/glu-common.cfg @@ -16,7 +16,7 @@ Import javax.media.opengl.util.* Import com.sun.opengl.impl.* Import com.sun.opengl.impl.glu.* Import com.sun.opengl.impl.glu.tessellator.GLUtessellatorImpl -Import com.sun.nwi.impl.NWReflection +Import com.sun.nativewindow.impl.NWReflection # Raise GLException instead of RuntimeException in glue code RuntimeExceptionType GLException diff --git a/make/config/jogl/glx-x11.cfg b/make/config/jogl/glx-x11.cfg index e1d684ef7..17b2a86be 100644 --- a/make/config/jogl/glx-x11.cfg +++ b/make/config/jogl/glx-x11.cfg @@ -16,7 +16,7 @@ GetProcAddressTableExpr glxProcAddressTable # This must be present for bootstrapping SkipProcAddressGen glXGetProcAddressARB -Import com.sun.nwi.impl.x11.* +Import com.sun.nativewindow.impl.x11.* CustomJavaCode GLX private static GLXProcAddressTable glxProcAddressTable = new GLXProcAddressTable(); CustomJavaCode GLX public static GLXProcAddressTable getGLXProcAddressTable() { return glxProcAddressTable; } diff --git a/make/config/jogl/glxext.cfg b/make/config/jogl/glxext.cfg index 4f964865a..d69a3df3b 100755 --- a/make/config/jogl/glxext.cfg +++ b/make/config/jogl/glxext.cfg @@ -17,7 +17,7 @@ EmitProcAddressTable true ProcAddressTableClassName GLXExtProcAddressTable GetProcAddressTableExpr _context.getGLXExtProcAddressTable() -Import com.sun.nwi.impl.x11.* +Import com.sun.nativewindow.impl.x11.* # Ignore everything that doesn't start with glX or GLX IgnoreNot ^(glX|GLX).+ diff --git a/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java b/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java index 1cc13e7d8..dab377ad4 100755 --- a/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java +++ b/make/config/nativewindow/jawt-DrawingSurfaceInfo-CustomJavaCode.java @@ -16,12 +16,12 @@ private static JAWT_PlatformInfo newPlatformInfo(ByteBuffer buf) { try { Class factoryClass; if (osName.startsWith("wind")) { - factoryClass = Class.forName("com.sun.nwi.impl.jawt.windows.JAWT_Win32DrawingSurfaceInfo"); + factoryClass = Class.forName("com.sun.nativewindow.impl.jawt.windows.JAWT_Win32DrawingSurfaceInfo"); } else if (osName.startsWith("mac os x")) { - factoryClass = Class.forName("com.sun.nwi.impl.jawt.macosx.JAWT_MacOSXDrawingSurfaceInfo"); + factoryClass = Class.forName("com.sun.nativewindow.impl.jawt.macosx.JAWT_MacOSXDrawingSurfaceInfo"); } else { // Assume Linux, Solaris, etc. Should probably test for these explicitly. - factoryClass = Class.forName("com.sun.nwi.impl.jawt.x11.JAWT_X11DrawingSurfaceInfo"); + factoryClass = Class.forName("com.sun.nativewindow.impl.jawt.x11.JAWT_X11DrawingSurfaceInfo"); } platformInfoFactoryMethod = factoryClass.getMethod("create", new Class[] { ByteBuffer.class }); diff --git a/make/config/nativewindow/jawt-macosx.cfg b/make/config/nativewindow/jawt-macosx.cfg index 57cceb6a1..b047ecdff 100644 --- a/make/config/nativewindow/jawt-macosx.cfg +++ b/make/config/nativewindow/jawt-macosx.cfg @@ -1,7 +1,7 @@ # This .cfg file is used to generate the interface to the JAWT, which # is used by the MacOSXOnscreenGLContext. Style AllStatic -Package com.sun.nwi.impl.jawt +Package com.sun.nativewindow.impl.jawt JavaClass JAWTFactory JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/MacOSX @@ -22,8 +22,8 @@ CustomCCode #include <jawt.h> CustomCCode #include </usr/include/machine/types.h> import java.security.* -import com.sun.nwi.impl.jawt.* -StructPackage JAWT_MacOSXDrawingSurfaceInfo com.sun.nwi.impl.jawt.macosx +import com.sun.nativewindow.impl.jawt.* +StructPackage JAWT_MacOSXDrawingSurfaceInfo com.sun.nativewindow.impl.jawt.macosx EmitStruct JAWT_MacOSXDrawingSurfaceInfo Implements JAWT_MacOSXDrawingSurfaceInfo JAWT_PlatformInfo diff --git a/make/config/nativewindow/jawt-win32.cfg b/make/config/nativewindow/jawt-win32.cfg index 74aef8f75..e7754843e 100644 --- a/make/config/nativewindow/jawt-win32.cfg +++ b/make/config/nativewindow/jawt-win32.cfg @@ -1,7 +1,7 @@ # This .cfg file is used to generate the interface to the JAWT, which # is used by the WindowsOnscreenGLContext. Style AllStatic -Package com.sun.nwi.impl.jawt +Package com.sun.nativewindow.impl.jawt JavaClass JAWTFactory JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/Windows @@ -22,8 +22,8 @@ CustomCCode #include <jawt.h> Include ../intptr.cfg import java.security.* -import com.sun.nwi.impl.jawt.* -StructPackage JAWT_Win32DrawingSurfaceInfo com.sun.nwi.impl.jawt.windows +import com.sun.nativewindow.impl.jawt.* +StructPackage JAWT_Win32DrawingSurfaceInfo com.sun.nativewindow.impl.jawt.windows EmitStruct JAWT_Win32DrawingSurfaceInfo Implements JAWT_Win32DrawingSurfaceInfo JAWT_PlatformInfo diff --git a/make/config/nativewindow/jawt-x11.cfg b/make/config/nativewindow/jawt-x11.cfg index fdcf16bdb..25df57a1f 100644 --- a/make/config/nativewindow/jawt-x11.cfg +++ b/make/config/nativewindow/jawt-x11.cfg @@ -1,7 +1,7 @@ # This .cfg file is used to generate the interface to the JAWT, which # is used by the X11OnscreenGLContext. Style AllStatic -Package com.sun.nwi.impl.jawt +Package com.sun.nativewindow.impl.jawt JavaClass JAWTFactory JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/X11 @@ -22,8 +22,8 @@ CustomCCode #include <inttypes.h> CustomCCode #include <jawt.h> import java.security.* -import com.sun.nwi.impl.jawt.* -StructPackage JAWT_X11DrawingSurfaceInfo com.sun.nwi.impl.jawt.x11 +import com.sun.nativewindow.impl.jawt.* +StructPackage JAWT_X11DrawingSurfaceInfo com.sun.nativewindow.impl.jawt.x11 EmitStruct JAWT_X11DrawingSurfaceInfo Implements JAWT_X11DrawingSurfaceInfo JAWT_PlatformInfo diff --git a/make/config/nativewindow/x11-CustomCCode.c b/make/config/nativewindow/x11-CustomCCode.c index 793327c72..b916715ce 100755 --- a/make/config/nativewindow/x11-CustomCCode.c +++ b/make/config/nativewindow/x11-CustomCCode.c @@ -49,16 +49,16 @@ Bool XF86VidModeSetGammaRamp( /* Need to expose DefaultScreen and RootWindow macros to Java */ JNIEXPORT jlong JNICALL -Java_com_sun_nwi_impl_x11_X11Lib_DefaultScreen(JNIEnv *env, jclass _unused, jlong display) { +Java_com_sun_nativewindow_impl_x11_X11Lib_DefaultScreen(JNIEnv *env, jclass _unused, jlong display) { return DefaultScreen((Display*) (intptr_t) display); } JNIEXPORT jlong JNICALL -Java_com_sun_nwi_impl_x11_X11Lib_RootWindow(JNIEnv *env, jclass _unused, jlong display, jint screen) { +Java_com_sun_nativewindow_impl_x11_X11Lib_RootWindow(JNIEnv *env, jclass _unused, jlong display, jint screen) { return RootWindow((Display*) (intptr_t) display, screen); } JNIEXPORT jlong JNICALL -Java_com_sun_nwi_impl_x11_X11Lib_dlopen(JNIEnv *env, jclass _unused, jstring name) { +Java_com_sun_nativewindow_impl_x11_X11Lib_dlopen(JNIEnv *env, jclass _unused, jstring name) { const jbyte* chars; void* res; chars = (*env)->GetStringUTFChars(env, name, NULL); @@ -68,7 +68,7 @@ Java_com_sun_nwi_impl_x11_X11Lib_dlopen(JNIEnv *env, jclass _unused, jstring nam } JNIEXPORT jlong JNICALL -Java_com_sun_nwi_impl_x11_X11Lib_dlsym(JNIEnv *env, jclass _unused, jstring name) { +Java_com_sun_nativewindow_impl_x11_X11Lib_dlsym(JNIEnv *env, jclass _unused, jstring name) { const jbyte* chars; void* res; chars = (*env)->GetStringUTFChars(env, name, NULL); diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg index 1448e7783..6e05efeb3 100644 --- a/make/config/nativewindow/x11-lib.cfg +++ b/make/config/nativewindow/x11-lib.cfg @@ -1,6 +1,6 @@ # This .cfg file is used to generate the interface to the GLX routines # used internally by the X11GLContext implementation. -Package com.sun.nwi.impl.x11 +Package com.sun.nativewindow.impl.x11 JavaClass X11Lib Style allstatic diff --git a/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java index 01e639ac6..f717833f9 100644 --- a/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java +++ b/src/jogl/classes/com/sun/opengl/impl/GLContextImpl.java @@ -43,7 +43,7 @@ import java.nio.*; import java.lang.reflect.*; import javax.media.opengl.*; -import com.sun.nwi.impl.NWReflection; +import com.sun.nativewindow.impl.NWReflection; import com.sun.gluegen.runtime.*; import com.sun.gluegen.runtime.opengl.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java index fcc55d4d7..5549da170 100644 --- a/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java +++ b/src/jogl/classes/com/sun/opengl/impl/GLDrawableFactoryImpl.java @@ -40,10 +40,10 @@ package com.sun.opengl.impl; import java.nio.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.gluegen.runtime.*; -import com.sun.nwi.impl.NWReflection; +import com.sun.nativewindow.impl.NWReflection; import java.lang.reflect.*; /** Extends GLDrawableFactory with a few methods for handling diff --git a/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java index f01f8eeda..ce1dc6fdf 100644 --- a/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java +++ b/src/jogl/classes/com/sun/opengl/impl/GLDrawableImpl.java @@ -39,7 +39,7 @@ package com.sun.opengl.impl; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; public abstract class GLDrawableImpl implements GLDrawable { diff --git a/src/jogl/classes/com/sun/opengl/impl/GLPbufferImpl.java b/src/jogl/classes/com/sun/opengl/impl/GLPbufferImpl.java index ed6f75401..c6cf74e19 100644 --- a/src/jogl/classes/com/sun/opengl/impl/GLPbufferImpl.java +++ b/src/jogl/classes/com/sun/opengl/impl/GLPbufferImpl.java @@ -46,7 +46,7 @@ import java.awt.event.*; import java.beans.PropertyChangeListener; */ -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; /** Platform-independent class exposing pbuffer functionality to diff --git a/src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java b/src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java index 8319de370..054b1e83b 100644 --- a/src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java +++ b/src/jogl/classes/com/sun/opengl/impl/NativeLibLoader.java @@ -46,14 +46,14 @@ import java.lang.reflect.Method; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.HashSet; -import com.sun.nwi.impl.NativeLibLoaderBase; +import com.sun.nativewindow.impl.NativeLibLoaderBase; public class NativeLibLoader extends NativeLibLoaderBase { public static void loadNEWT() { AccessController.doPrivileged(new PrivilegedAction() { public Object run() { - loadLibrary("newt", nwiX11Preload, true); + loadLibrary("newt", nativewindowX11Preload, true); return null; } }); @@ -62,7 +62,7 @@ public class NativeLibLoader extends NativeLibLoaderBase { public static void loadGL2() { AccessController.doPrivileged(new PrivilegedAction() { public Object run() { - loadLibrary("jogl_gl2", nwiX11Preload, true); + loadLibrary("jogl_gl2", nativewindowX11Preload, true); return null; } }); @@ -71,7 +71,7 @@ public class NativeLibLoader extends NativeLibLoaderBase { public static void loadGL2ES12() { AccessController.doPrivileged(new PrivilegedAction() { public Object run() { - loadLibrary("jogl_gl2es12", nwiX11Preload, true); + loadLibrary("jogl_gl2es12", nativewindowX11Preload, true); return null; } }); @@ -80,7 +80,7 @@ public class NativeLibLoader extends NativeLibLoaderBase { public static void loadES2() { AccessController.doPrivileged(new PrivilegedAction() { public Object run() { - loadLibrary("jogl_es2", nwiX11Preload, true); + loadLibrary("jogl_es2", nativewindowX11Preload, true); return null; } }); @@ -89,7 +89,7 @@ public class NativeLibLoader extends NativeLibLoaderBase { public static void loadES1() { AccessController.doPrivileged(new PrivilegedAction() { public Object run() { - loadLibrary("jogl_es1", nwiX11Preload, true); + loadLibrary("jogl_es1", nativewindowX11Preload, true); return null; } }); @@ -98,7 +98,7 @@ public class NativeLibLoader extends NativeLibLoaderBase { public static void loadCgImpl() { AccessController.doPrivileged(new PrivilegedAction() { public Object run() { - String[] preload = { "nwi", "cg", "cgGL" }; + String[] preload = { "nativewindow", "cg", "cgGL" }; loadLibrary("jogl_cg", preload, true); return null; } @@ -129,7 +129,7 @@ public class NativeLibLoader extends NativeLibLoaderBase { } } - private static final String[] nwiX11Preload = { "nwi_x11" }; + private static final String[] nativewindowX11Preload = { "nativewindow_x11" }; private static boolean usingJNLPAppletLauncher; private static Method jnlpLoadLibraryMethod; diff --git a/src/jogl/classes/com/sun/opengl/impl/awt/AWTUtil.java b/src/jogl/classes/com/sun/opengl/impl/awt/AWTUtil.java index d156f86f8..6170e4b29 100644 --- a/src/jogl/classes/com/sun/opengl/impl/awt/AWTUtil.java +++ b/src/jogl/classes/com/sun/opengl/impl/awt/AWTUtil.java @@ -36,7 +36,7 @@ package com.sun.opengl.impl.awt; -import com.sun.nwi.impl.jawt.*; +import com.sun.nativewindow.impl.jawt.*; import com.sun.opengl.impl.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLConfig.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLConfig.java index 2c03a20a6..f9ad6e318 100644 --- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLConfig.java +++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLConfig.java @@ -36,7 +36,7 @@ package com.sun.opengl.impl.egl; import java.util.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.gluegen.runtime.NativeLibrary; diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java index 97ae63cd4..4e2347fcc 100755 --- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLContext.java @@ -35,7 +35,7 @@ package com.sun.opengl.impl.egl; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.gluegen.runtime.ProcAddressTable; diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java index 4843bba12..733891009 100755 --- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawable.java @@ -36,9 +36,9 @@ package com.sun.opengl.impl.egl; import com.sun.opengl.impl.GLDrawableImpl; -import com.sun.nwi.impl.NWReflection; +import com.sun.nativewindow.impl.NWReflection; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; public class EGLDrawable extends GLDrawableImpl { diff --git a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java index 8af7a3fbf..332a0a815 100755 --- a/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java +++ b/src/jogl/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java @@ -36,7 +36,7 @@ package com.sun.opengl.impl.egl; import java.util.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import com.sun.gluegen.runtime.NativeLibrary; diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java index 0bf9414e8..4e4c2e329 100644 --- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLContext.java @@ -41,7 +41,7 @@ package com.sun.opengl.impl.macosx.cgl; 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.gluegen.runtime.ProcAddressTable; diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java index 01816b190..67358878e 100644 --- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawable.java @@ -39,7 +39,7 @@ package com.sun.opengl.impl.macosx.cgl; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java index ae09fa9ea..318b6b123 100644 --- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java +++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXCGLDrawableFactory.java @@ -42,7 +42,7 @@ package com.sun.opengl.impl.macosx.cgl; import java.lang.reflect.InvocationTargetException; import java.nio.*; import java.util.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java index aaaf38277..42eab51a1 100644 --- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOffscreenCGLDrawable.java @@ -39,7 +39,7 @@ package com.sun.opengl.impl.macosx.cgl; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java index 0767f40ee..e11ac512b 100644 --- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLContext.java @@ -41,7 +41,7 @@ package com.sun.opengl.impl.macosx.cgl; import java.util.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java index e17eee602..42e3957c2 100644 --- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXOnscreenCGLDrawable.java @@ -43,7 +43,7 @@ import java.lang.ref.WeakReference; import java.security.*; import java.util.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java index f927731eb..7141778ae 100644 --- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLContext.java @@ -3,7 +3,7 @@ package com.sun.opengl.impl.macosx.cgl; import java.security.*; import java.util.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java index af5676d96..6be7392b0 100644 --- a/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/macosx/cgl/MacOSXPbufferCGLDrawable.java @@ -39,10 +39,10 @@ package com.sun.opengl.impl.macosx.cgl; -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.nativewindow.impl.NullWindow; public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable { private static final boolean DEBUG = Debug.debug("MacOSXPbufferCGLDrawable"); diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java index 1f1359269..619d28720 100644 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsDummyWGLDrawable.java @@ -39,10 +39,10 @@ package com.sun.opengl.impl.windows.wgl; -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.nativewindow.impl.NullWindow; public class WindowsDummyWGLDrawable extends WindowsWGLDrawable { private long hwnd, hdc; diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java index 4a16749e3..9de51e04c 100755 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsExternalWGLDrawable.java @@ -39,10 +39,10 @@ package com.sun.opengl.impl.windows.wgl; -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.nativewindow.impl.NullWindow; public class WindowsExternalWGLDrawable extends WindowsWGLDrawable { diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java index 6318d1d26..979362780 100644 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java @@ -39,10 +39,10 @@ package com.sun.opengl.impl.windows.wgl; -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.nativewindow.impl.NullWindow; public class WindowsOffscreenWGLDrawable extends WindowsWGLDrawable { private long origbitmap; diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java index 7eb96c7dc..0f553ffbb 100644 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLContext.java @@ -41,7 +41,7 @@ package com.sun.opengl.impl.windows.wgl; import java.util.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java index 7c3cea255..ef9bf49c1 100644 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsOnscreenWGLDrawable.java @@ -39,7 +39,7 @@ package com.sun.opengl.impl.windows.wgl; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java index e975670b4..87921f7e0 100644 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLContext.java @@ -39,7 +39,7 @@ package com.sun.opengl.impl.windows.wgl; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java index b904ca913..c829cca63 100644 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsPbufferWGLDrawable.java @@ -39,10 +39,10 @@ package com.sun.opengl.impl.windows.wgl; -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.nativewindow.impl.NullWindow; public class WindowsPbufferWGLDrawable extends WindowsWGLDrawable { private long cachedParentHdc; diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java index 1ce190da3..0f6682872 100644 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLContext.java @@ -41,7 +41,7 @@ package com.sun.opengl.impl.windows.wgl; 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.gluegen.runtime.ProcAddressTable; diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java index 430270e37..534b0adf0 100644 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawable.java @@ -39,7 +39,7 @@ package com.sun.opengl.impl.windows.wgl; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; diff --git a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java index 437b57db0..d5dd930ed 100644 --- a/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java +++ b/src/jogl/classes/com/sun/opengl/impl/windows/wgl/WindowsWGLDrawableFactory.java @@ -41,7 +41,7 @@ package com.sun.opengl.impl.windows.wgl; import java.nio.*; import java.util.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.*; import javax.media.opengl.util.BufferUtil; 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.*; diff --git a/src/jogl/classes/com/sun/opengl/util/ImmModeSink.java b/src/jogl/classes/com/sun/opengl/util/ImmModeSink.java index 5b17b0e9d..4f30cd7b1 100644 --- a/src/jogl/classes/com/sun/opengl/util/ImmModeSink.java +++ b/src/jogl/classes/com/sun/opengl/util/ImmModeSink.java @@ -5,7 +5,7 @@ import javax.media.opengl.*; import javax.media.opengl.util.*; import javax.media.opengl.sub.*; import javax.media.opengl.sub.fixed.*; -import com.sun.nwi.impl.NWReflection; +import com.sun.nativewindow.impl.NWReflection; import java.nio.*; import java.util.Iterator; import java.util.ArrayList; diff --git a/src/jogl/classes/com/sun/opengl/util/awt/TextRenderer.java b/src/jogl/classes/com/sun/opengl/util/awt/TextRenderer.java index b7616d879..58f021e90 100755 --- a/src/jogl/classes/com/sun/opengl/util/awt/TextRenderer.java +++ b/src/jogl/classes/com/sun/opengl/util/awt/TextRenderer.java @@ -66,7 +66,7 @@ import java.text.*; import java.util.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import javax.media.opengl.glu.*; import javax.media.opengl.glu.gl2.*; diff --git a/src/jogl/classes/javax/media/opengl/GLDrawable.java b/src/jogl/classes/javax/media/opengl/GLDrawable.java index c2bbcb860..26fdc8753 100644 --- a/src/jogl/classes/javax/media/opengl/GLDrawable.java +++ b/src/jogl/classes/javax/media/opengl/GLDrawable.java @@ -39,7 +39,7 @@ package javax.media.opengl; -import javax.media.nwi.*; +import javax.media.nativewindow.*; // FIXME: We need some way to tell when the device upon which the canvas is // being displayed has changed (e.g., the user drags the canvas's parent diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java index 60399afce..21e5ddcbb 100644 --- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java +++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java @@ -39,12 +39,12 @@ package javax.media.opengl; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import java.lang.reflect.*; import java.security.*; import com.sun.opengl.impl.*; -import com.sun.nwi.impl.NWReflection; +import com.sun.nativewindow.impl.NWReflection; /** <P> Provides a virtual machine- and operating system-independent mechanism for creating {@link GLDrawable}s. </P> diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java index 687027dec..5180a4e2d 100644 --- a/src/jogl/classes/javax/media/opengl/GLProfile.java +++ b/src/jogl/classes/javax/media/opengl/GLProfile.java @@ -40,7 +40,7 @@ import javax.media.opengl.sub.fixed.*; import java.lang.reflect.*; import java.security.*; import com.sun.opengl.impl.*; -import com.sun.nwi.impl.NWReflection; +import com.sun.nativewindow.impl.NWReflection; public class GLProfile { /** The desktop (OpenGL 2.0) profile */ diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java index 031c5f854..8ef797c97 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java @@ -40,9 +40,9 @@ package javax.media.opengl.awt; import javax.media.opengl.*; -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 com.sun.opengl.impl.*; diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java index 2efae7e96..9ea7d59dd 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java @@ -40,7 +40,7 @@ package javax.media.opengl.awt; import javax.media.opengl.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import java.awt.*; import java.awt.geom.*; diff --git a/src/jogl/classes/javax/media/opengl/sub/fixed/GLFixedFuncUtil.java b/src/jogl/classes/javax/media/opengl/sub/fixed/GLFixedFuncUtil.java index 9c384e934..4f6688879 100644 --- a/src/jogl/classes/javax/media/opengl/sub/fixed/GLFixedFuncUtil.java +++ b/src/jogl/classes/javax/media/opengl/sub/fixed/GLFixedFuncUtil.java @@ -7,7 +7,7 @@ package javax.media.opengl.sub.fixed; import javax.media.opengl.*; import javax.media.opengl.sub.*; -import com.sun.nwi.impl.NWReflection; +import com.sun.nativewindow.impl.NWReflection; import java.lang.reflect.*; /** diff --git a/src/jogl/classes/javax/media/opengl/util/BufferUtil.java.javame_cdc_fp b/src/jogl/classes/javax/media/opengl/util/BufferUtil.java.javame_cdc_fp index 116b337d4..5cad64d04 100755 --- a/src/jogl/classes/javax/media/opengl/util/BufferUtil.java.javame_cdc_fp +++ b/src/jogl/classes/javax/media/opengl/util/BufferUtil.java.javame_cdc_fp @@ -44,7 +44,7 @@ import javax.media.opengl.GL2; import javax.media.opengl.GL2ES2; import javax.media.opengl.GLException; import javax.media.opengl.GLProfile; -import com.sun.nwi.impl.NWReflection; +import com.sun.nativewindow.impl.NWReflection; import java.nio.*; import java.util.*; diff --git a/src/jogl/classes/javax/media/opengl/util/BufferUtil.java.javase b/src/jogl/classes/javax/media/opengl/util/BufferUtil.java.javase index a27c136c3..c3b0a3ab8 100755 --- a/src/jogl/classes/javax/media/opengl/util/BufferUtil.java.javase +++ b/src/jogl/classes/javax/media/opengl/util/BufferUtil.java.javase @@ -44,7 +44,7 @@ import javax.media.opengl.GL2; import javax.media.opengl.GL2ES2; import javax.media.opengl.GLException; import javax.media.opengl.GLProfile; -import com.sun.nwi.impl.NWReflection; +import com.sun.nativewindow.impl.NWReflection; import java.nio.*; import java.util.*; diff --git a/src/newt/classes/com/sun/javafx/newt/NewtFactory.java b/src/newt/classes/com/sun/javafx/newt/NewtFactory.java index 312c6f825..c0116d0a3 100755 --- a/src/newt/classes/com/sun/javafx/newt/NewtFactory.java +++ b/src/newt/classes/com/sun/javafx/newt/NewtFactory.java @@ -33,7 +33,7 @@ package com.sun.javafx.newt; -import javax.media.nwi.NWCapabilities; +import javax.media.nativewindow.NWCapabilities; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/newt/classes/com/sun/javafx/newt/Window.java b/src/newt/classes/com/sun/javafx/newt/Window.java index 459022e4b..e9466b7d6 100755 --- a/src/newt/classes/com/sun/javafx/newt/Window.java +++ b/src/newt/classes/com/sun/javafx/newt/Window.java @@ -34,9 +34,9 @@ package com.sun.javafx.newt; import com.sun.javafx.newt.impl.Debug; -import javax.media.nwi.NWCapabilities; -import javax.media.nwi.NativeWindow; -import javax.media.nwi.NativeWindowException; +import javax.media.nativewindow.NWCapabilities; +import javax.media.nativewindow.NativeWindow; +import javax.media.nativewindow.NativeWindowException; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/newt/classes/com/sun/javafx/newt/awt/AWTWindow.java b/src/newt/classes/com/sun/javafx/newt/awt/AWTWindow.java index 8badf6d4e..bc1ffb828 100644 --- a/src/newt/classes/com/sun/javafx/newt/awt/AWTWindow.java +++ b/src/newt/classes/com/sun/javafx/newt/awt/AWTWindow.java @@ -47,8 +47,8 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.util.*; import com.sun.javafx.newt.Window; -import javax.media.nwi.NWCapabilities; -import javax.media.nwi.NativeWindowException; +import javax.media.nativewindow.NWCapabilities; +import javax.media.nativewindow.NativeWindowException; /** An implementation of the Newt Window class built using the AWT. This is provided for convenience of porting to platforms diff --git a/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java b/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java index 7db04bb78..3e8104280 100644 --- a/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java +++ b/src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java @@ -46,14 +46,14 @@ import java.lang.reflect.Method; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.HashSet; -import com.sun.nwi.impl.NativeLibLoaderBase; +import com.sun.nativewindow.impl.NativeLibLoaderBase; public class NativeLibLoader extends NativeLibLoaderBase { public static void loadNEWT() { AccessController.doPrivileged(new PrivilegedAction() { public Object run() { - String[] preload = { "nwi" }; + String[] preload = { "nativewindow" }; loadLibrary("newt", preload, true); return null; } diff --git a/src/newt/classes/com/sun/javafx/newt/macosx/MacWindow.java b/src/newt/classes/com/sun/javafx/newt/macosx/MacWindow.java index e4fe64560..3447ea888 100755 --- a/src/newt/classes/com/sun/javafx/newt/macosx/MacWindow.java +++ b/src/newt/classes/com/sun/javafx/newt/macosx/MacWindow.java @@ -33,8 +33,8 @@ package com.sun.javafx.newt.macosx; -import javax.media.nwi.NWCapabilities; -import javax.media.nwi.NativeWindowException; +import javax.media.nativewindow.NWCapabilities; +import javax.media.nativewindow.NativeWindowException; import com.sun.javafx.newt.*; import com.sun.javafx.newt.impl.*; diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java b/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java index a8fd648cc..1d4b4c5ad 100644 --- a/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java +++ b/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java @@ -34,7 +34,7 @@ package com.sun.javafx.newt.opengl; import com.sun.javafx.newt.*; -import javax.media.nwi.*; +import javax.media.nativewindow.*; import javax.media.opengl.*; import com.sun.opengl.impl.GLDrawableHelper; diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java index 70c8980d2..3efe4efe6 100755 --- a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java +++ b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java @@ -36,7 +36,7 @@ package com.sun.javafx.newt.opengl.kd; import com.sun.javafx.newt.*; import com.sun.javafx.newt.impl.*; import com.sun.opengl.impl.egl.*; -import javax.media.nwi.NativeWindowException; +import javax.media.nativewindow.NativeWindowException; public class KDDisplay extends Display { static { diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java index 8c1a7597e..e17e3040d 100755 --- a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java +++ b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java @@ -36,9 +36,9 @@ package com.sun.javafx.newt.opengl.kd; import com.sun.javafx.newt.*; import com.sun.javafx.newt.impl.*; import com.sun.opengl.impl.egl.*; -import javax.media.nwi.NWCapabilities; +import javax.media.nativewindow.NWCapabilities; import javax.media.opengl.GLProfile; -import javax.media.nwi.NativeWindowException; +import javax.media.nativewindow.NativeWindowException; public class KDWindow extends Window { private static final String WINDOW_CLASS_NAME = "NewtWindow"; diff --git a/src/newt/classes/com/sun/javafx/newt/windows/WindowsWindow.java b/src/newt/classes/com/sun/javafx/newt/windows/WindowsWindow.java index 2b3401a84..956220c47 100755 --- a/src/newt/classes/com/sun/javafx/newt/windows/WindowsWindow.java +++ b/src/newt/classes/com/sun/javafx/newt/windows/WindowsWindow.java @@ -33,8 +33,8 @@ package com.sun.javafx.newt.windows; -import javax.media.nwi.NWCapabilities; -import javax.media.nwi.NativeWindowException; +import javax.media.nativewindow.NWCapabilities; +import javax.media.nativewindow.NativeWindowException; import com.sun.javafx.newt.*; import com.sun.javafx.newt.impl.*; diff --git a/src/newt/classes/com/sun/javafx/newt/x11/X11Window.java b/src/newt/classes/com/sun/javafx/newt/x11/X11Window.java index 8b2de8c03..6e336f25d 100755 --- a/src/newt/classes/com/sun/javafx/newt/x11/X11Window.java +++ b/src/newt/classes/com/sun/javafx/newt/x11/X11Window.java @@ -35,8 +35,8 @@ package com.sun.javafx.newt.x11; import com.sun.javafx.newt.*; import com.sun.javafx.newt.impl.*; -import javax.media.nwi.NWCapabilities; -import javax.media.nwi.NativeWindowException; +import javax.media.nativewindow.NWCapabilities; +import javax.media.nativewindow.NativeWindowException; public class X11Window extends Window { private static final String WINDOW_CLASS_NAME = "NewtWindow"; |