aboutsummaryrefslogtreecommitdiffstats
path: root/src/newt/classes
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2009-03-17 21:07:26 +0000
committerKenneth Russel <[email protected]>2009-03-17 21:07:26 +0000
commit40c18b4e195aca93e981a2b5393ddaa6983599d2 (patch)
treecba01877447486cc8ba3e05a637d1b8456535544 /src/newt/classes
parent9a44770462cc3e10af1eee66a75e708bd540fce9 (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/newt/classes')
-rwxr-xr-xsrc/newt/classes/com/sun/javafx/newt/NewtFactory.java2
-rwxr-xr-xsrc/newt/classes/com/sun/javafx/newt/Window.java6
-rw-r--r--src/newt/classes/com/sun/javafx/newt/awt/AWTWindow.java4
-rw-r--r--src/newt/classes/com/sun/javafx/newt/impl/NativeLibLoader.java4
-rwxr-xr-xsrc/newt/classes/com/sun/javafx/newt/macosx/MacWindow.java4
-rw-r--r--src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java2
-rwxr-xr-xsrc/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java2
-rwxr-xr-xsrc/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java4
-rwxr-xr-xsrc/newt/classes/com/sun/javafx/newt/windows/WindowsWindow.java4
-rwxr-xr-xsrc/newt/classes/com/sun/javafx/newt/x11/X11Window.java4
10 files changed, 18 insertions, 18 deletions
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";