Adaption to JOGL 1ad8c39df6b097c80ba7a85badf555e7f669cc3f

18 files changed, 16 insertions, 19 deletions

diff --git a/src/demos/GLInfo.java b/src/demos/GLInfo.java
index b8575e2..55bf9cd 100755
--- a/src/demos/GLInfo.java
+++ b/src/demos/GLInfo.java
@@ -4,6 +4,7 @@ import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 
 import com.jogamp.newt.*;
+import com.jogamp.newt.event.*;
 import com.jogamp.newt.opengl.*;
 
 public class GLInfo extends Thread implements GLEventListener {
@@ -82,7 +83,6 @@ public class GLInfo extends Thread implements GLEventListener {
 
             // Shut things down cooperatively
             window.destroy();
-            window.getFactory().shutdown();
             System.out.println(glp+" GLInfo shut down cleanly.");
         } catch (Throwable t) {
             t.printStackTrace();
diff --git a/src/demos/GLNewtRun.java b/src/demos/GLNewtRun.java
index b774983..a1b22e3 100755
--- a/src/demos/GLNewtRun.java
+++ b/src/demos/GLNewtRun.java
@@ -6,6 +6,7 @@ import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 
 import com.jogamp.newt.*;
+import com.jogamp.newt.event.*;
 import com.jogamp.newt.opengl.*;
 
 public class GLNewtRun implements WindowListener, KeyListener, MouseListener {
diff --git a/src/demos/applets/JOGLNewtAppletBase.java b/src/demos/applets/JOGLNewtAppletBase.java
index 961ccfd..a8cb160 100755
--- a/src/demos/applets/JOGLNewtAppletBase.java
+++ b/src/demos/applets/JOGLNewtAppletBase.java
@@ -3,6 +3,7 @@ package demos.applets;
 import java.lang.reflect.*;
 
 import com.jogamp.newt.*;
+import com.jogamp.newt.event.*;
 import com.jogamp.newt.opengl.GLWindow;
 
 import javax.media.opengl.*;
diff --git a/src/demos/es1/Info.java b/src/demos/es1/Info.java
index 9322862..20e6687 100755
--- a/src/demos/es1/Info.java
+++ b/src/demos/es1/Info.java
@@ -43,7 +43,6 @@ public class Info implements GLEventListener {
 
             // Shut things down cooperatively
             window.destroy();
-            window.getFactory().shutdown();
             System.out.println("Info shut down cleanly.");
         } catch (Throwable t) {
             t.printStackTrace();
diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java
index 91534a7..2f1e4c1 100755
--- a/src/demos/es1/RedSquare.java
+++ b/src/demos/es1/RedSquare.java
@@ -11,6 +11,7 @@ import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
 import com.jogamp.newt.*;
+import com.jogamp.newt.event.*;
 import com.jogamp.newt.opengl.*;
 
 public class RedSquare extends Thread implements WindowListener, KeyListener, MouseListener, GLEventListener {
@@ -169,9 +170,6 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
             System.out.println("SHUTDOWN "+Thread.currentThread()+" START");
             // Shut things down cooperatively
             window.destroy();
-            if(oneThread) {
-                window.getFactory().shutdown();
-            }
             window = null;
             if(null!=nWindow) {
                 nWindow.destroy(true);
diff --git a/src/demos/es1/angeles/Main.java b/src/demos/es1/angeles/Main.java
index 35da6e1..9d903dd 100755
--- a/src/demos/es1/angeles/Main.java
+++ b/src/demos/es1/angeles/Main.java
@@ -3,6 +3,7 @@ package demos.es1.angeles;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.jogamp.newt.*;
+import com.jogamp.newt.event.*;
 import com.jogamp.newt.opengl.*;
 
 public class Main implements WindowListener, MouseListener {
@@ -99,7 +100,6 @@ public class Main implements WindowListener, MouseListener {
 
             // Shut things down cooperatively
             window.destroy();
-            window.getFactory().shutdown();
             System.out.println("angeles.Main shut down cleanly.");
         } catch (GLException e) {
             e.printStackTrace();
diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java
index f1af890..95c9514 100644
--- a/src/demos/es1/cube/Cube.java
+++ b/src/demos/es1/cube/Cube.java
@@ -349,7 +349,6 @@ public class Cube implements GLEventListener {
 
             // Shut things down cooperatively
             window.destroy();
-            window.getFactory().shutdown();
             System.out.println("Cube shut down cleanly.");
         } catch (Throwable t) {
             t.printStackTrace();
diff --git a/src/demos/es1/cube/CubeImmModeSink.java b/src/demos/es1/cube/CubeImmModeSink.java
index 34ae022..584a7f2 100644
--- a/src/demos/es1/cube/CubeImmModeSink.java
+++ b/src/demos/es1/cube/CubeImmModeSink.java
@@ -416,7 +416,6 @@ public class CubeImmModeSink implements GLEventListener {
 
             // Shut things down cooperatively
             window.destroy();
-            window.getFactory().shutdown();
             System.out.println("CubeImmModeSink shut down cleanly.");
         } catch (Throwable t) {
             t.printStackTrace();
diff --git a/src/demos/es1/cubefbo/Main.java b/src/demos/es1/cubefbo/Main.java
index 6a1281d..bef2761 100755
--- a/src/demos/es1/cubefbo/Main.java
+++ b/src/demos/es1/cubefbo/Main.java
@@ -3,6 +3,7 @@ package demos.es1.cubefbo;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.jogamp.newt.*;
+import com.jogamp.newt.event.*;
 import com.jogamp.newt.opengl.*;
 
 public class Main implements WindowListener, MouseListener {
@@ -87,7 +88,6 @@ public class Main implements WindowListener, MouseListener {
 
             // Shut things down cooperatively
             window.destroy();
-            window.getFactory().shutdown();
             System.out.println("cubefbo.Main shut down cleanly.");
         } catch (GLException e) {
             e.printStackTrace();
diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java
index 975a3f9..f289bdb 100755
--- a/src/demos/es2/RedSquare.java
+++ b/src/demos/es2/RedSquare.java
@@ -9,6 +9,7 @@ import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.glsl.*;
 
 import com.jogamp.newt.*;
+import com.jogamp.newt.event.*;
 import com.jogamp.newt.opengl.*;
 
 public class RedSquare extends Thread implements WindowListener, KeyListener, MouseListener, GLEventListener {
@@ -144,9 +145,6 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
         try {
             // Shut things down cooperatively
             window.destroy();
-            if(oneThread) {
-                window.getFactory().shutdown();
-            }
             window = null;
             if(null!=nWindow) {
                 nWindow.destroy(true);
diff --git a/src/demos/es2/openmax/Cube.java b/src/demos/es2/openmax/Cube.java
index edcfba0..a6dfc53 100644
--- a/src/demos/es2/openmax/Cube.java
+++ b/src/demos/es2/openmax/Cube.java
@@ -342,7 +342,6 @@ public class Cube implements GLEventListener {
 
             // Shut things down cooperatively
             window.destroy();
-            window.getFactory().shutdown();
             System.out.println("Cube shut down cleanly.");
         } catch (Throwable t) {
             t.printStackTrace();
diff --git a/src/demos/es2/openmax/MovieCube.java b/src/demos/es2/openmax/MovieCube.java
index f59bea2..6b53c6d 100755
--- a/src/demos/es2/openmax/MovieCube.java
+++ b/src/demos/es2/openmax/MovieCube.java
@@ -43,6 +43,7 @@ import com.jogamp.openmax.*;
 import java.net.*;
 
 import com.jogamp.newt.*;
+import com.jogamp.newt.event.*;
 import com.jogamp.newt.opengl.*;
 
 public class MovieCube implements MouseListener, GLEventListener, OMXEventListener {
@@ -114,7 +115,6 @@ public class MovieCube implements MouseListener, GLEventListener, OMXEventListen
                 movie=null;
             }
             window.destroy();
-            window.getFactory().shutdown();
             System.out.println("MovieCube shut down cleanly.");
         } catch (Throwable t) {
             t.printStackTrace();
diff --git a/src/demos/es2/openmax/MovieSimple.java b/src/demos/es2/openmax/MovieSimple.java
index b702699..015d3b5 100755
--- a/src/demos/es2/openmax/MovieSimple.java
+++ b/src/demos/es2/openmax/MovieSimple.java
@@ -45,6 +45,7 @@ import java.nio.*;
 import java.net.*;
 
 import com.jogamp.newt.*;
+import com.jogamp.newt.event.*;
 import com.jogamp.newt.opengl.*;
 
 public class MovieSimple implements MouseListener, GLEventListener, OMXEventListener {
@@ -123,7 +124,6 @@ public class MovieSimple implements MouseListener, GLEventListener, OMXEventList
                 movie=null;
             }
             window.destroy();
-            window.getFactory().shutdown();
             System.out.println("MovieSimple shut down cleanly.");
         } catch (Throwable t) {
             t.printStackTrace();
diff --git a/src/demos/es2/perftst/Perftst.java b/src/demos/es2/perftst/Perftst.java
index 5b090cd..d44479e 100755
--- a/src/demos/es2/perftst/Perftst.java
+++ b/src/demos/es2/perftst/Perftst.java
@@ -7,6 +7,7 @@ import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.glsl.*;
 
 import com.jogamp.newt.*;
+import com.jogamp.newt.event.*;
 import com.jogamp.newt.opengl.*;
 
 public class Perftst implements MouseListener, GLEventListener {
@@ -74,7 +75,6 @@ public class Perftst implements MouseListener, GLEventListener {
 
             // Shut things down cooperatively
             window.destroy();
-            window.getFactory().shutdown();
             System.out.println("Perftst shut down cleanly.");
         } catch (Throwable t) {
             t.printStackTrace();
diff --git a/src/demos/newt/NEWTTest1.java b/src/demos/newt/NEWTTest1.java
index 59f6051..ab8d577 100644
--- a/src/demos/newt/NEWTTest1.java
+++ b/src/demos/newt/NEWTTest1.java
@@ -2,6 +2,7 @@ package demos.newt;
 
 import javax.media.nativewindow.*;
 import com.jogamp.newt.*;
+import com.jogamp.newt.event.*;
 
 public class NEWTTest1 implements WindowListener, KeyListener, MouseListener
 {
diff --git a/src/demos/newt/TaskManagerTest1.java b/src/demos/newt/TaskManagerTest1.java
index 5743537..62f0a89 100644
--- a/src/demos/newt/TaskManagerTest1.java
+++ b/src/demos/newt/TaskManagerTest1.java
@@ -2,6 +2,7 @@ package demos.newt;
 
 import javax.media.nativewindow.*;
 import com.jogamp.newt.*;
+import com.jogamp.newt.event.*;
 import demos.newt.util.TaskManager;
 
 public class TaskManagerTest1  implements WindowListener, KeyListener, MouseListener
diff --git a/src/demos/newt/TaskManagerTest2.java b/src/demos/newt/TaskManagerTest2.java
index 62a9cee..0b61342 100644
--- a/src/demos/newt/TaskManagerTest2.java
+++ b/src/demos/newt/TaskManagerTest2.java
@@ -2,6 +2,7 @@ package demos.newt;
 
 import javax.media.nativewindow.*;
 import com.jogamp.newt.*;
+import com.jogamp.newt.event.*;
 import demos.newt.util.TaskToolWM;
 
 public class TaskManagerTest2  implements WindowListener, KeyListener, MouseListener
@@ -27,7 +28,7 @@ public class TaskManagerTest2  implements WindowListener, KeyListener, MouseList
         System.err.println("windowDestroyNotify "+e);
         // stop running ..
         System.err.println("Window Event Listener DestroyNotify send stop request - START");
-        TaskToolWM.unregisterWindowEvent(e.getSource());
+        TaskToolWM.unregisterWindowEvent((Window)e.getSource());
         System.err.println("Window Event Listener DestroyNotify send stop request - DONE");
     }
 
@@ -35,7 +36,7 @@ public class TaskManagerTest2  implements WindowListener, KeyListener, MouseList
         System.err.println("keyPressed "+e);
         if(e.getKeyChar()=='q') {
             System.err.println("Key Event Listener 'q' - ..");
-            TaskToolWM.unregisterWindowEvent(e.getSource());
+            TaskToolWM.unregisterWindowEvent((Window)e.getSource());
         }
     }
     public void keyReleased(KeyEvent e) {
diff --git a/src/demos/readbuffer/Main.java b/src/demos/readbuffer/Main.java
index 67c1b59..566750e 100755
--- a/src/demos/readbuffer/Main.java
+++ b/src/demos/readbuffer/Main.java
@@ -4,6 +4,7 @@ import java.lang.reflect.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 import com.jogamp.newt.*;
+import com.jogamp.newt.event.*;
 import com.jogamp.newt.opengl.*;
 
 public class Main implements WindowListener, MouseListener, SurfaceUpdatedListener {
@@ -154,7 +155,6 @@ public class Main implements WindowListener, MouseListener, SurfaceUpdatedListen
             try {
                 Thread.sleep(2000);
             } catch (Exception e) {}
-            windowOffscreen.getFactory().shutdown();
             System.out.println("readbuffer.Main shut down cleanly.");
         } catch (GLException e) {
             e.printStackTrace();