Fix for NEWT Changes: GLWindow: remove ambigous create functions, ie with Window and Capabilities arguments

11 files changed, 36 insertions, 13 deletions

diff --git a/src/demos/GLInfo.java b/src/demos/GLInfo.java
index 2c00668..938e087 100755
--- a/src/demos/GLInfo.java
+++ b/src/demos/GLInfo.java
@@ -37,8 +37,10 @@ public class GLInfo extends Thread implements GLEventListener {
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
                 nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
                 System.err.println(glp+" "+nWindow);
+                window = GLWindow.create(nWindow);
+            } else {
+                window = GLWindow.create(caps);
             }
-            window = GLWindow.create(nWindow, caps);
 
             System.err.println(glp+" GLWindow : "+window);
 
diff --git a/src/demos/es1/Info.java b/src/demos/es1/Info.java
index 8d83692..972fd5e 100755
--- a/src/demos/es1/Info.java
+++ b/src/demos/es1/Info.java
@@ -29,8 +29,10 @@ public class Info implements GLEventListener {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
                 nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                window = GLWindow.create(nWindow);
+            } else {
+                window = GLWindow.create(caps);
             }
-            window = GLWindow.create(nWindow, caps);
 
             window.addGLEventListener(this);
 
diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java
index 3123a9d..187a5af 100755
--- a/src/demos/es1/RedSquare.java
+++ b/src/demos/es1/RedSquare.java
@@ -97,8 +97,10 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
                 nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                window = GLWindow.create(nWindow);
+            } else {
+                window = GLWindow.create(caps);
             }
-            window = GLWindow.create(nWindow, caps);
 
             window.addWindowListener(this);
             window.addMouseListener(this);
diff --git a/src/demos/es1/angeles/Main.java b/src/demos/es1/angeles/Main.java
index 3b8400b..40e24d0 100755
--- a/src/demos/es1/angeles/Main.java
+++ b/src/demos/es1/angeles/Main.java
@@ -64,8 +64,10 @@ public class Main implements WindowListener, MouseListener {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
                 nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                window = GLWindow.create(nWindow);
+            } else {
+                window = GLWindow.create(caps);
             }
-            window = GLWindow.create(nWindow, caps);
 
             window.addWindowListener(this);
             window.addMouseListener(this);
diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java
index 8917697..d9c00b2 100644
--- a/src/demos/es1/cube/Cube.java
+++ b/src/demos/es1/cube/Cube.java
@@ -301,14 +301,16 @@ public class Cube implements GLEventListener {
             caps.setDepthBits(16);
 
             Window nWindow = null;
+            GLWindow window;
             if(0!=(type&USE_AWT)) {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
                 nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                window = GLWindow.create(nWindow);
+            } else {
+                window = GLWindow.create(caps);
             }
 
-            GLWindow window = GLWindow.create(nWindow, caps);
-
             window.addGLEventListener(this);
 
             window.enablePerfLog(true);
diff --git a/src/demos/es1/cube/CubeImmModeSink.java b/src/demos/es1/cube/CubeImmModeSink.java
index b072535..cf22e90 100644
--- a/src/demos/es1/cube/CubeImmModeSink.java
+++ b/src/demos/es1/cube/CubeImmModeSink.java
@@ -389,12 +389,15 @@ public class CubeImmModeSink implements GLEventListener {
             caps.setDepthBits(16);
 
             Window nWindow = null;
+            GLWindow window;
             if(0!=(type&USE_AWT)) {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
                 nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                window = GLWindow.create(nWindow);
+            } else {
+                window = GLWindow.create(caps);
             }
-            GLWindow window = GLWindow.create(nWindow, caps);
 
             window.addGLEventListener(this);
 
diff --git a/src/demos/es1/cubefbo/Main.java b/src/demos/es1/cubefbo/Main.java
index 51a03c7..44aa4d2 100755
--- a/src/demos/es1/cubefbo/Main.java
+++ b/src/demos/es1/cubefbo/Main.java
@@ -65,8 +65,10 @@ public class Main implements WindowListener, MouseListener {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
                 nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                window = GLWindow.create(nWindow);
+            } else {
+                window = GLWindow.create(caps);
             }
-            window = GLWindow.create(nWindow, caps);
 
             window.addWindowListener(this);
             window.addMouseListener(this);
diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java
index da4505c..6996eed 100755
--- a/src/demos/es2/RedSquare.java
+++ b/src/demos/es2/RedSquare.java
@@ -97,8 +97,10 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
                 nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                window = GLWindow.create(nWindow);
+            } else {
+                window = GLWindow.create(caps);
             }
-            window = GLWindow.create(nWindow, caps);
 
             window.addWindowListener(this);
             window.addMouseListener(this);
diff --git a/src/demos/es2/openmax/Cube.java b/src/demos/es2/openmax/Cube.java
index 706d8b5..46d25c1 100644
--- a/src/demos/es2/openmax/Cube.java
+++ b/src/demos/es2/openmax/Cube.java
@@ -318,14 +318,16 @@ public class Cube implements GLEventListener {
             caps.setDepthBits(16);
 
             Window nWindow = null;
+            GLWindow window;
             if(0!=(type&USE_AWT)) {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
                 nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                window = GLWindow.create(nWindow);
+            } else {
+                window = GLWindow.create(caps);
             }
 
-            GLWindow window = GLWindow.create(nWindow, caps);
-
             window.addGLEventListener(this);
 
             window.enablePerfLog(true);
diff --git a/src/demos/es2/perftst/Perftst.java b/src/demos/es2/perftst/Perftst.java
index f023e4d..06520df 100755
--- a/src/demos/es2/perftst/Perftst.java
+++ b/src/demos/es2/perftst/Perftst.java
@@ -56,8 +56,10 @@ public class Perftst implements MouseListener, GLEventListener {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
                 nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                window = GLWindow.create(nWindow);
+            } else {
+                window = GLWindow.create(caps);
             }
-            window = GLWindow.create(nWindow, caps);
 
             window.addMouseListener(this);
             window.addGLEventListener(this);
diff --git a/src/jbullet/src/javabullet/demos/opengl/JOGL.java b/src/jbullet/src/javabullet/demos/opengl/JOGL.java
index 1e3408e..078e9c5 100644
--- a/src/jbullet/src/javabullet/demos/opengl/JOGL.java
+++ b/src/jbullet/src/javabullet/demos/opengl/JOGL.java
@@ -87,8 +87,10 @@ public class JOGL implements WindowListener, MouseListener {
                 Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
                 Screen nScreen  = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
                 nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, nScreen, caps);
+                window = GLWindow.create(nWindow);
+            } else {
+                window = GLWindow.create(caps);
             }
-            window = GLWindow.create(nWindow, caps);
 
             window.addWindowListener(this);
             window.addMouseListener(this);