Adaption to JOGL 1ad8c39df6b097c80ba7a85badf555e7f669cc3f

5 files changed, 4 insertions, 7 deletions

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();