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

10 files changed, 28 insertions, 28 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