Continue 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@1881 232f8b59-042b-4e1e-8c03-345bb8c30851

30 files changed, 83 insertions, 86 deletions

diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/Debug.java b/src/nativewindow/classes/com/sun/nativewindow/impl/Debug.java
index 73379e87b..5d53f88fd 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/Debug.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/Debug.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.nwi.impl;
+package com.sun.nativewindow.impl;
 
 import java.security.*;
 
@@ -49,13 +49,13 @@ public class Debug {
   private static boolean debugAll;
   
   static {
-    verbose = isPropertyDefined("nwi.verbose");
-    debugAll = isPropertyDefined("nwi.debug");
+    verbose = isPropertyDefined("nativewindow.verbose");
+    debugAll = isPropertyDefined("nativewindow.debug");
     if (verbose) {
-       Package p = Package.getPackage("javax.media.nwi");
-       System.err.println("NWI specification version " + p.getSpecificationVersion());
-       System.err.println("NWI implementation version " + p.getImplementationVersion());
-       System.err.println("NWI implementation vendor " + p.getImplementationVendor());
+       Package p = Package.getPackage("javax.media.nativewindow");
+       System.err.println("NativeWindow specification version " + p.getSpecificationVersion());
+       System.err.println("NativeWindow implementation version " + p.getImplementationVersion());
+       System.err.println("NativeWindow implementation vendor " + p.getImplementationVendor());
     }
   }
 
@@ -88,6 +88,6 @@ public class Debug {
   }
 
   public static boolean debug(String subcomponent) {
-    return debugAll() || isPropertyDefined("nwi.debug." + subcomponent);
+    return debugAll() || isPropertyDefined("nativewindow.debug." + subcomponent);
   }
 }
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/NWReflection.java b/src/nativewindow/classes/com/sun/nativewindow/impl/NWReflection.java
index 51037af28..aec6e3175 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/NWReflection.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/NWReflection.java
@@ -34,10 +34,10 @@
  * facility.
  */
 
-package com.sun.nwi.impl;
+package com.sun.nativewindow.impl;
 
 import java.lang.reflect.*;
-import javax.media.nwi.*;
+import javax.media.nativewindow.*;
 
 public final class NWReflection {
   public static final boolean DEBUG = Debug.debug("NWReflection");
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/NativeLibLoaderBase.java b/src/nativewindow/classes/com/sun/nativewindow/impl/NativeLibLoaderBase.java
index 9e072fec0..0be1f77d6 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/NativeLibLoaderBase.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/NativeLibLoaderBase.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.nwi.impl;
+package com.sun.nativewindow.impl;
 
 // FIXME: refactor Java SE dependencies
 //import java.awt.Toolkit;
@@ -104,10 +104,10 @@ public class NativeLibLoaderBase {
     }
   }
   
-  public static void loadNWI(final String ossuffix) {
+  public static void loadNativeWindow(final String ossuffix) {
     AccessController.doPrivileged(new PrivilegedAction() {
       public Object run() {
-        loadLibrary("nwi_"+ossuffix, null, false);
+        loadLibrary("nativewindow_"+ossuffix, null, false);
         return null;
       }
     });
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/NativeWindowFactoryImpl.java b/src/nativewindow/classes/com/sun/nativewindow/impl/NativeWindowFactoryImpl.java
index ce164204c..6e8542181 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/NativeWindowFactoryImpl.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/NativeWindowFactoryImpl.java
@@ -30,12 +30,12 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.sun.nwi.impl;
+package com.sun.nativewindow.impl;
 
 import java.lang.reflect.*;
 import java.security.*;
 
-import javax.media.nwi.*;
+import javax.media.nativewindow.*;
 
 public class NativeWindowFactoryImpl extends NativeWindowFactory {
     protected static final boolean DEBUG = Debug.debug("NativeWindowFactoryImpl");
@@ -57,7 +57,7 @@ public class NativeWindowFactoryImpl extends NativeWindowFactory {
 
         throw new IllegalArgumentException("Target window object type " +
                                            winObj.getClass().getName() + " is unsupported; expected " +
-                                           "javax.media.nwi.NativeWindow or java.awt.Component");
+                                           "javax.media.nativewindow.NativeWindow or java.awt.Component");
     }
     
     private Constructor nativeWindowConstructor = null;
@@ -73,12 +73,12 @@ public class NativeWindowFactoryImpl extends NativeWindowFactory {
                 // make it easier to run this code on mobile devices
 
                 if (osNameLowerCase.startsWith("wind")) {
-                    windowClassName = "com.sun.nwi.impl.jawt.windows.WindowsJAWTWindow";
+                    windowClassName = "com.sun.nativewindow.impl.jawt.windows.WindowsJAWTWindow";
                 } else if (osNameLowerCase.startsWith("mac os x")) {
-                    windowClassName = "com.sun.nwi.impl.jawt.macosx.MacOSXJAWTWindow";
+                    windowClassName = "com.sun.nativewindow.impl.jawt.macosx.MacOSXJAWTWindow";
                 } else {
                     // Assume Linux, Solaris, etc. Should probably test for these explicitly.
-                    windowClassName = "com.sun.nwi.impl.jawt.x11.X11JAWTWindow";
+                    windowClassName = "com.sun.nativewindow.impl.jawt.x11.X11JAWTWindow";
                 }
 
                 if (windowClassName == null) {
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java
index 727d3dd03..fe07b0f16 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java
@@ -34,9 +34,9 @@
  * facility.
  */
 
-package com.sun.nwi.impl;
+package com.sun.nativewindow.impl;
 
-import javax.media.nwi.*;
+import javax.media.nativewindow.*;
 
 public class NullWindow implements NativeWindow {
   protected boolean locked;
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTNativeLibLoader.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTNativeLibLoader.java
index 064a85b65..4b5b57f04 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTNativeLibLoader.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTNativeLibLoader.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.nwi.impl.jawt;
+package com.sun.nativewindow.impl.jawt;
 
-import com.sun.nwi.impl.*;
+import com.sun.nativewindow.impl.*;
 
 import java.awt.Toolkit;
 import java.lang.reflect.InvocationTargetException;
@@ -63,7 +63,7 @@ public class JAWTNativeLibLoader extends NativeLibLoaderBase {
         boolean isOSX = System.getProperty("os.name").equals("Mac OS X");
         String[] preload = { "jawt" };
 
-        loadLibrary("nwi_awt", (isOSX)?null:preload, false);
+        loadLibrary("nativewindow_awt", (isOSX)?null:preload, false);
         return null;
       }
     });
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
index 887513523..a996f9ea9 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTUtil.java
@@ -34,17 +34,17 @@
  * facility.
  */
 
-package com.sun.nwi.impl.jawt;
+package com.sun.nativewindow.impl.jawt;
 
-import com.sun.nwi.impl.*;
+import com.sun.nativewindow.impl.*;
 
-import javax.media.nwi.*;
+import javax.media.nativewindow.*;
 
 import java.awt.GraphicsEnvironment;
 
 public class JAWTUtil {
   static {
-        NativeLibLoaderBase.loadNWI("awt");
+        NativeLibLoaderBase.loadNativeWindow("awt");
   }
 
   // See whether we're running in headless mode
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTWindow.java
index 1311f3b4b..c710a67bf 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTWindow.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWTWindow.java
@@ -34,15 +34,14 @@
  * facility.
  */
 
-package com.sun.nwi.impl.jawt;
+package com.sun.nativewindow.impl.jawt;
 
-import com.sun.nwi.impl.*;
+import com.sun.nativewindow.impl.*;
 
 import java.awt.Component;
 import java.awt.GraphicsEnvironment;
-import javax.media.nwi.*;
-import javax.media.nwi.*;
-import com.sun.nwi.impl.*;
+import javax.media.nativewindow.*;
+import com.sun.nativewindow.impl.*;
 
 public abstract class JAWTWindow implements NativeWindow {
   protected static final boolean DEBUG = Debug.debug("GLDrawable");
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWT_PlatformInfo.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWT_PlatformInfo.java
index c71bdc918..cc6af7ea4 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWT_PlatformInfo.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/JAWT_PlatformInfo.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.nwi.impl.jawt;
+package com.sun.nativewindow.impl.jawt;
 
-import com.sun.nwi.impl.*;
+import com.sun.nativewindow.impl.*;
 
 /** Marker class for all window system-specific JAWT data structures. */
 
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java
index 4d911da36..310f17f64 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/macosx/MacOSXJAWTWindow.java
@@ -37,16 +37,15 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.nwi.impl.jawt.macosx;
+package com.sun.nativewindow.impl.jawt.macosx;
 
-import com.sun.nwi.impl.jawt.*;
-import com.sun.nwi.impl.*;
+import com.sun.nativewindow.impl.jawt.*;
+import com.sun.nativewindow.impl.*;
 
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 
-import javax.media.nwi.*;
-import javax.media.nwi.*;
+import javax.media.nativewindow.*;
 import java.security.*;
 
 public class MacOSXJAWTWindow extends JAWTWindow {
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java
index cf5c0f328..364ee9d32 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/windows/WindowsJAWTWindow.java
@@ -37,12 +37,12 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.nwi.impl.jawt.windows;
+package com.sun.nativewindow.impl.jawt.windows;
 
-import com.sun.nwi.impl.jawt.*;
+import com.sun.nativewindow.impl.*;
+import com.sun.nativewindow.impl.jawt.*;
 
-import javax.media.nwi.*;
-import com.sun.nwi.impl.*;
+import javax.media.nativewindow.*;
 
 public class WindowsJAWTWindow extends JAWTWindow {
 
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11JAWTWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11JAWTWindow.java
index 16fcb6b57..60b68c0e8 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11JAWTWindow.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11JAWTWindow.java
@@ -34,14 +34,13 @@
  * facility.
  */
 
-package com.sun.nwi.impl.jawt.x11;
+package com.sun.nativewindow.impl.jawt.x11;
 
-import com.sun.nwi.impl.x11.*;
-import com.sun.nwi.impl.jawt.*;
-import com.sun.nwi.impl.*;
+import com.sun.nativewindow.impl.x11.*;
+import com.sun.nativewindow.impl.jawt.*;
+import com.sun.nativewindow.impl.*;
 
-import javax.media.nwi.*;
-import javax.media.nwi.*;
+import javax.media.nativewindow.*;
 
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11SunJDKReflection.java b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11SunJDKReflection.java
index d7d8daee4..f8c1624df 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11SunJDKReflection.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/jawt/x11/X11SunJDKReflection.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.nwi.impl.jawt.x11;
+package com.sun.nativewindow.impl.jawt.x11;
 
-import com.sun.nwi.impl.x11.*;
+import com.sun.nativewindow.impl.x11.*;
 
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11Util.java b/src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11Util.java
index b38dd5959..af3300ec8 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11Util.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/x11/X11Util.java
@@ -30,15 +30,15 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.sun.nwi.impl.x11;
+package com.sun.nativewindow.impl.x11;
 
-import javax.media.nwi.*;
+import javax.media.nativewindow.*;
 
-import com.sun.nwi.impl.*;
+import com.sun.nativewindow.impl.*;
 
 public class X11Util {
     static {
-        NativeLibLoaderBase.loadNWI("x11");
+        NativeLibLoaderBase.loadNativeWindow("x11");
     }
 
     private static final boolean DEBUG = Debug.debug("X11Util");
diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/x11/awt/X11AWTNativeWindowFactory.java b/src/nativewindow/classes/com/sun/nativewindow/impl/x11/awt/X11AWTNativeWindowFactory.java
index 87feb5f50..e3bf428cc 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/x11/awt/X11AWTNativeWindowFactory.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/x11/awt/X11AWTNativeWindowFactory.java
@@ -30,17 +30,17 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package com.sun.nwi.impl.x11.awt;
+package com.sun.nativewindow.impl.x11.awt;
 
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
-import javax.media.nwi.*;
+import javax.media.nativewindow.*;
 
-import com.sun.nwi.impl.*;
-import com.sun.nwi.impl.jawt.*;
-import com.sun.nwi.impl.jawt.x11.*;
-import com.sun.nwi.impl.x11.*;
+import com.sun.nativewindow.impl.*;
+import com.sun.nativewindow.impl.jawt.*;
+import com.sun.nativewindow.impl.jawt.x11.*;
+import com.sun.nativewindow.impl.x11.*;
 
 public class X11AWTNativeWindowFactory extends NativeWindowFactoryImpl {
 
diff --git a/src/nativewindow/classes/javax/media/nativewindow/AbstractGraphicsConfiguration.java b/src/nativewindow/classes/javax/media/nativewindow/AbstractGraphicsConfiguration.java
index a85aca41c..512ebf17c 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/AbstractGraphicsConfiguration.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/AbstractGraphicsConfiguration.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.nwi;
+package javax.media.nativewindow;
 
 /** A marker interface describing a graphics configuration, visual, or
     pixel format in a toolkit-independent manner. */
diff --git a/src/nativewindow/classes/javax/media/nativewindow/AbstractGraphicsDevice.java b/src/nativewindow/classes/javax/media/nativewindow/AbstractGraphicsDevice.java
index 743210273..3bef97aaf 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/AbstractGraphicsDevice.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/AbstractGraphicsDevice.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.nwi;
+package javax.media.nativewindow;
 
 /** A marker interface describing a graphics device in a
     toolkit-independent manner. */
diff --git a/src/nativewindow/classes/javax/media/nativewindow/DefaultNWCapabilitiesChooser.java b/src/nativewindow/classes/javax/media/nativewindow/DefaultNWCapabilitiesChooser.java
index 1318ea419..0e18a301d 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/DefaultNWCapabilitiesChooser.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/DefaultNWCapabilitiesChooser.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.nwi;
+package javax.media.nativewindow;
 
 /** <P> The default implementation of the {@link
     NWCapabilitiesChooser} interface, which provides consistent visual
diff --git a/src/nativewindow/classes/javax/media/nativewindow/NWCapabilities.java b/src/nativewindow/classes/javax/media/nativewindow/NWCapabilities.java
index cc3ebb77c..0b0ee99f7 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/NWCapabilities.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/NWCapabilities.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.nwi;
+package javax.media.nativewindow;
 
 /** Specifies a set of OpenGL capabilities that a rendering context
     must support, such as color depth and whether stereo is enabled.
diff --git a/src/nativewindow/classes/javax/media/nativewindow/NWCapabilitiesChooser.java b/src/nativewindow/classes/javax/media/nativewindow/NWCapabilitiesChooser.java
index 12884c5e2..a980462f5 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/NWCapabilitiesChooser.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/NWCapabilitiesChooser.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.nwi;
+package javax.media.nativewindow;
 
 /** Provides a mechanism by which applications can customize the
     window type selection for a given {@link NWCapabilities}.
diff --git a/src/nativewindow/classes/javax/media/nativewindow/NWException.java b/src/nativewindow/classes/javax/media/nativewindow/NWException.java
index a9e5b054d..7d21277e6 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/NWException.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/NWException.java
@@ -37,9 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.nwi;
+package javax.media.nativewindow;
 
-/** A generic exception for NWI errors used throughout the binding
+/** A generic exception for errors used throughout the binding
     as a substitute for {@link RuntimeException}. */
 
 public class NWException extends RuntimeException {
diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindow.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindow.java
index f992c2231..99b301997 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindow.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindow.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.nwi;
+package javax.media.nativewindow;
 
 /** Provides the mechanism by which the Java / OpenGL binding
     interacts with windows. A window toolkit such as the AWT may
diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowException.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowException.java
index bc1a8ddef..593c1e7d6 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowException.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowException.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.nwi;
+package javax.media.nativewindow;
 
 /** A generic exception for OpenGL errors used throughout the binding
     as a substitute for {@link RuntimeException}. */
diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
index 622dfc3a7..fc9235075 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java
@@ -30,14 +30,14 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package javax.media.nwi;
+package javax.media.nativewindow;
 
-import javax.media.nwi.*;
+import javax.media.nativewindow.*;
 import java.lang.reflect.*;
 import java.security.*;
 import java.util.*;
 
-import com.sun.nwi.impl.*;
+import com.sun.nativewindow.impl.*;
 
 /** Provides the link between the window toolkit and the Java binding
     to the OpenGL API. The NativeWindowFactory, and NativeWindow
@@ -69,7 +69,7 @@ public abstract class NativeWindowFactory {
         // make it easier to run this code on mobile devices
 
         NativeWindowFactory factory = new NativeWindowFactoryImpl();
-        nativeWindowClass = javax.media.nwi.NativeWindow.class;
+        nativeWindowClass = javax.media.nativewindow.NativeWindow.class;
         registerFactory(nativeWindowClass, factory);
         defaultFactory = factory;
         
@@ -84,7 +84,7 @@ public abstract class NativeWindowFactory {
                 // Assume X11 platform -- should probably test for these explicitly
                 try {
                     Constructor factoryConstructor =
-                        NWReflection.getConstructor("com.sun.nwi.impl.x11.awt.X11AWTNativeWindowFactory", new Class[] {});
+                        NWReflection.getConstructor("com.sun.nativewindow.impl.x11.awt.X11AWTNativeWindowFactory", new Class[] {});
                     factory = (NativeWindowFactory) factoryConstructor.newInstance(null);
                 } catch (Exception e) { }
             }
diff --git a/src/nativewindow/classes/javax/media/nativewindow/ToolkitLock.java b/src/nativewindow/classes/javax/media/nativewindow/ToolkitLock.java
index c9e2b4170..6b9d25190 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/ToolkitLock.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/ToolkitLock.java
@@ -30,7 +30,7 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package javax.media.nwi;
+package javax.media.nativewindow;
 
 /** Provides an interface for locking and unlocking the underlying
     window toolkit, where this is necessary in the OpenGL
diff --git a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java
index 313654c05..389417615 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.nwi.awt;
+package javax.media.nativewindow.awt;
 
 import java.awt.GraphicsConfiguration;
-import javax.media.nwi.AbstractGraphicsConfiguration;
+import javax.media.nativewindow.AbstractGraphicsConfiguration;
 
 /** A wrapper for an AWT GraphicsConfiguration allowing it to be
     handled in a toolkit-independent manner. */
diff --git a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsDevice.java b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsDevice.java
index f6da16176..72c53f550 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsDevice.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsDevice.java
@@ -37,10 +37,10 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package javax.media.nwi.awt;
+package javax.media.nativewindow.awt;
 
 import java.awt.GraphicsDevice;
-import javax.media.nwi.AbstractGraphicsDevice;
+import javax.media.nativewindow.AbstractGraphicsDevice;
 
 /** A wrapper for an AWT GraphicsDevice allowing it to be
     handled in a toolkit-independent manner. */
diff --git a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java
index f18185fa7..c40f26a94 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java
@@ -30,9 +30,9 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package javax.media.nwi.x11;
+package javax.media.nativewindow.x11;
 
-import javax.media.nwi.*;
+import javax.media.nativewindow.*;
 
 /** Encapsulates a graphics configuration, or OpenGL pixel format, on
     X11 platforms. Objects of this type are returned from {@link
diff --git a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsDevice.java b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsDevice.java
index 3288447d9..5a12e0e62 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsDevice.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsDevice.java
@@ -30,9 +30,9 @@
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-package javax.media.nwi.x11;
+package javax.media.nativewindow.x11;
 
-import javax.media.nwi.*;
+import javax.media.nativewindow.*;
 
 /** Encapsulates a graphics device, or screen, on X11
     platforms. Objects of this type are passed to {@link
diff --git a/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c b/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c
index 0a6daace0..e4afbdb70 100644
--- a/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c
+++ b/src/nativewindow/native/JAWT_DrawingSurfaceInfo.c
@@ -50,7 +50,7 @@
 #endif
 
 JNIEXPORT jobject JNICALL
-Java_com_sun_nwi_impl_jawt_JAWT_1DrawingSurfaceInfo_platformInfo0(JNIEnv* env, jobject unused, jobject jthis0) {
+Java_com_sun_nativewindow_impl_jawt_JAWT_1DrawingSurfaceInfo_platformInfo0(JNIEnv* env, jobject unused, jobject jthis0) {
   JAWT_DrawingSurfaceInfo* dsi;
   dsi = (*env)->GetDirectBufferAddress(env, jthis0);
   if (dsi == NULL) {