Updated demos after refactoring of OpenGL capability bits back into GLCapabilities

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JOGL_2_SANDBOX@323 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

6 files changed, 6 insertions, 12 deletions

diff --git a/src/demos/es1/Info.java b/src/demos/es1/Info.java
index 13cf038..7a675a7 100755
--- a/src/demos/es1/Info.java
+++ b/src/demos/es1/Info.java
@@ -1,7 +1,6 @@
 package demos.es1;
 
 import java.nio.*;
-import javax.media.nwi.*;
 import javax.media.opengl.*;
 import javax.media.opengl.util.*;
 import javax.media.opengl.glu.*;
@@ -19,7 +18,7 @@ public class Info implements GLEventListener {
         System.err.println("Info.run()");
         GLProfile.setProfileGL2ES1();
         try {
-            NWCapabilities caps = new NWCapabilities();
+            GLCapabilities caps = new GLCapabilities();
             // For emulation library, use 16 bpp
             caps.setRedBits(5);
             caps.setGreenBits(6);
diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java
index 1de39c6..f5bc050 100755
--- a/src/demos/es1/RedSquare.java
+++ b/src/demos/es1/RedSquare.java
@@ -1,7 +1,6 @@
 package demos.es1;
 
 import java.nio.*;
-import javax.media.nwi.*;
 import javax.media.opengl.*;
 import javax.media.opengl.sub.fixed.*;
 import javax.media.opengl.util.*;
@@ -66,7 +65,7 @@ public class RedSquare implements WindowListener, KeyListener, MouseListener, GL
         System.err.println("RedSquare.run()");
         GLProfile.setProfileGLAny();
         try {
-            NWCapabilities caps = new NWCapabilities();
+            GLCapabilities caps = new GLCapabilities();
             // For emulation library, use 16 bpp
             caps.setRedBits(5);
             caps.setGreenBits(6);
diff --git a/src/demos/es1/angeles/Main.java b/src/demos/es1/angeles/Main.java
index 9a97305..30aed45 100755
--- a/src/demos/es1/angeles/Main.java
+++ b/src/demos/es1/angeles/Main.java
@@ -1,7 +1,6 @@
 package demos.es1.angeles;
 
 import java.nio.*;
-import javax.media.nwi.*;
 import javax.media.opengl.*;
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
@@ -43,7 +42,7 @@ public class Main implements WindowListener, MouseListener {
         GLProfile.setProfileGLAny();
         try {
             // Hook this into EGL
-            NWCapabilities caps = new NWCapabilities();
+            GLCapabilities caps = new GLCapabilities();
             // For emulation library, use 16 bpp
             caps.setRedBits(5);
             caps.setGreenBits(6);
diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java
index e472af0..59b4514 100644
--- a/src/demos/es1/cube/Cube.java
+++ b/src/demos/es1/cube/Cube.java
@@ -32,7 +32,6 @@
 package demos.es1.cube;
 
 import java.nio.*;
-import javax.media.nwi.*;
 import javax.media.opengl.*;
 import javax.media.opengl.sub.fixed.*;
 import javax.media.opengl.util.*;
@@ -293,7 +292,7 @@ public class Cube implements GLEventListener {
         System.err.println("Cube.run()");
         GLProfile.setProfileGLAny();
         try {
-            NWCapabilities caps = new NWCapabilities();
+            GLCapabilities caps = new GLCapabilities();
             // For emulation library, use 16 bpp
             caps.setRedBits(5);
             caps.setGreenBits(6);
diff --git a/src/demos/es1/cube/CubeImmModeSink.java b/src/demos/es1/cube/CubeImmModeSink.java
index 9a9d7cf..341889e 100644
--- a/src/demos/es1/cube/CubeImmModeSink.java
+++ b/src/demos/es1/cube/CubeImmModeSink.java
@@ -31,7 +31,6 @@
  */
 package demos.es1.cube;
 
-import javax.media.nwi.*;
 import javax.media.opengl.*;
 import javax.media.opengl.sub.fixed.*;
 import javax.media.opengl.util.*;
@@ -383,7 +382,7 @@ public class CubeImmModeSink implements GLEventListener {
         System.err.println("CubeImmModeSink.run()");
         GLProfile.setProfileGLAny();
         try {
-            NWCapabilities caps = new NWCapabilities();
+            GLCapabilities caps = new GLCapabilities();
             // For emulation library, use 16 bpp
             caps.setRedBits(5);
             caps.setGreenBits(6);
diff --git a/src/demos/es1/cubefbo/Main.java b/src/demos/es1/cubefbo/Main.java
index 5b46773..b299ca4 100755
--- a/src/demos/es1/cubefbo/Main.java
+++ b/src/demos/es1/cubefbo/Main.java
@@ -1,7 +1,6 @@
 package demos.es1.cubefbo;
 
 import java.nio.*;
-import javax.media.nwi.*;
 import javax.media.opengl.*;
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
@@ -50,7 +49,7 @@ public class Main implements WindowListener, MouseListener {
         GLProfile.setProfileGLAny();
         try {
             // Hook this into EGL
-            NWCapabilities caps = new NWCapabilities();
+            GLCapabilities caps = new GLCapabilities();
             // For emulation library, use 16 bpp
             caps.setRedBits(5);
             caps.setGreenBits(6);