Adaption to JOGL 1ad8c39df6b097c80ba7a85badf555e7f669cc3f

6 files changed, 3 insertions, 8 deletions

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