fixed jogl-demos since we moved some packages in jogl.

30 files changed, 51 insertions, 51 deletions

diff --git a/cvm-dbg-newt.sh b/cvm-dbg-newt.sh
index 24a3c66..f6f2c31 100755
--- a/cvm-dbg-newt.sh
+++ b/cvm-dbg-newt.sh
@@ -22,5 +22,5 @@ fi
 # D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
 D_ARGS="-Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all"
 
-$CVM $X_FLAGS -Djava.awt.headless=true $D_ARGS -Dsun.boot.library.path=../jogl/$BUILD_SUBDIR/lib -Xbootclasspath/a:../gluegen/$BUILD_SUBDIR/gluegen-rt-cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/nativewindow/nativewindow.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/jogl/jogl.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/newt/newt.all.cdc.jar -Xbootclasspath/a:$BUILD_SUBDIR/jogl-demos.jar com.sun.javafx.newt.util.MainThread $* 2>&1 | tee cvm-dbg-newt.log
+$CVM $X_FLAGS -Djava.awt.headless=true $D_ARGS -Dsun.boot.library.path=../jogl/$BUILD_SUBDIR/lib -Xbootclasspath/a:../gluegen/$BUILD_SUBDIR/gluegen-rt-cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/nativewindow/nativewindow.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/jogl/jogl.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/newt/newt.all.cdc.jar -Xbootclasspath/a:$BUILD_SUBDIR/jogl-demos.jar com.jogamp.javafx.newt.util.MainThread $* 2>&1 | tee cvm-dbg-newt.log
 
diff --git a/cvm-run-newt.sh b/cvm-run-newt.sh
index 6c52fc5..da26de1 100755
--- a/cvm-run-newt.sh
+++ b/cvm-run-newt.sh
@@ -19,4 +19,4 @@ if [ "$1" = "-cpu" ] ; then
     shift
 fi
 
-$CVM $X_FLAGS -Djava.awt.headless=true -Dsun.boot.library.path=../jogl/$BUILD_SUBDIR/lib -Xbootclasspath/a:../gluegen/$BUILD_SUBDIR/gluegen-rt-cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/nativewindow/nativewindow.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/jogl/jogl.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/newt/newt.all.cdc.jar -Xbootclasspath/a:$BUILD_SUBDIR/jogl-demos.jar com.sun.javafx.newt.util.MainThread $* 2>&1 | tee cvm-run-newt.log
+$CVM $X_FLAGS -Djava.awt.headless=true -Dsun.boot.library.path=../jogl/$BUILD_SUBDIR/lib -Xbootclasspath/a:../gluegen/$BUILD_SUBDIR/gluegen-rt-cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/nativewindow/nativewindow.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/jogl/jogl.all.cdc.jar -Xbootclasspath/a:../jogl/$BUILD_SUBDIR/newt/newt.all.cdc.jar -Xbootclasspath/a:$BUILD_SUBDIR/jogl-demos.jar com.jogamp.javafx.newt.util.MainThread $* 2>&1 | tee cvm-run-newt.log
diff --git a/java-dbg-newt.sh b/java-dbg-newt.sh
index 6c735e7..7421d7d 100755
--- a/java-dbg-newt.sh
+++ b/java-dbg-newt.sh
@@ -20,5 +20,5 @@ else
         X_ARGS="-XstartOnFirstThread"
     fi
 
-    java $X_ARGS -Djava.awt.headless=true $D_ARGS com.sun.javafx.newt.util.MainThread $* 2>&1 | tee java-dbg-newt.log
+    java $X_ARGS -Djava.awt.headless=true $D_ARGS com.jogamp.javafx.newt.util.MainThread $* 2>&1 | tee java-dbg-newt.log
 fi
diff --git a/java-run-newt.sh b/java-run-newt.sh
index b2a5674..0739d85 100755
--- a/java-run-newt.sh
+++ b/java-run-newt.sh
@@ -18,5 +18,5 @@ else
         X_ARGS="-XstartOnFirstThread"
     fi
 
-    java $X_ARGS -Djava.awt.headless=true com.sun.javafx.newt.util.MainThread $* 2>&1 | tee java-run-newt.log
+    java $X_ARGS -Djava.awt.headless=true com.jogamp.javafx.newt.util.MainThread $* 2>&1 | tee java-run-newt.log
 fi
diff --git a/setenv-jogl.sh b/setenv-jogl.sh
index eb23fec..8c7e8d4 100644
--- a/setenv-jogl.sh
+++ b/setenv-jogl.sh
@@ -93,7 +93,7 @@ export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GLUEGEN_OS:$JOGL_LIB_DIR
 echo CLASSPATH: $CLASSPATH
 echo
 echo MacOSX REMEMBER to add the JVM arguments "-XstartOnFirstThread -Djava.awt.headless=true" for running demos without AWT, e.g. NEWT
-echo MacOSX REMEMBER to add the JVM arguments "-XstartOnFirstThread -Djava.awt.headless=true com.sun.javafx.newt.util.MainThread" for running demos with NEWT
+echo MacOSX REMEMBER to add the JVM arguments "-XstartOnFirstThread -Djava.awt.headless=true com.jogamp.javafx.newt.util.MainThread" for running demos with NEWT
 
 PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
 export PATH
diff --git a/src/demos/GLInfo.java b/src/demos/GLInfo.java
index 938e087..e4c0892 100755
--- a/src/demos/GLInfo.java
+++ b/src/demos/GLInfo.java
@@ -5,8 +5,8 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.nativewindow.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class GLInfo extends Thread implements GLEventListener {
 
diff --git a/src/demos/GLNewtRun.java b/src/demos/GLNewtRun.java
index fd663b3..d8d2f73 100755
--- a/src/demos/GLNewtRun.java
+++ b/src/demos/GLNewtRun.java
@@ -6,8 +6,8 @@ import java.lang.reflect.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class GLNewtRun implements WindowListener, KeyListener, MouseListener {
 
diff --git a/src/demos/applets/JOGLNewtApplet1Run.java b/src/demos/applets/JOGLNewtApplet1Run.java
index e3696ab..c53f5d4 100755
--- a/src/demos/applets/JOGLNewtApplet1Run.java
+++ b/src/demos/applets/JOGLNewtApplet1Run.java
@@ -8,8 +8,8 @@ import java.awt.event.KeyListener;
 
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 /** Shows how to deploy an applet using JOGL. This demo must be
     referenced from a web page via an <applet> tag. */
diff --git a/src/demos/applets/JOGLNewtAppletBase.java b/src/demos/applets/JOGLNewtAppletBase.java
index 628699d..6cd9ec9 100755
--- a/src/demos/applets/JOGLNewtAppletBase.java
+++ b/src/demos/applets/JOGLNewtAppletBase.java
@@ -3,8 +3,8 @@ package demos.applets;
 import java.util.*;
 import java.lang.reflect.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.GLWindow;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.GLWindow;
 
 import javax.media.opengl.*;
 import com.jogamp.opengl.util.*;
diff --git a/src/demos/es1/Info.java b/src/demos/es1/Info.java
index 972fd5e..a1023a1 100755
--- a/src/demos/es1/Info.java
+++ b/src/demos/es1/Info.java
@@ -5,8 +5,8 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.nativewindow.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class Info implements GLEventListener {
 
diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java
index afbae11..d712147 100755
--- a/src/demos/es1/RedSquare.java
+++ b/src/demos/es1/RedSquare.java
@@ -9,8 +9,8 @@ import javax.media.nativewindow.*;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class RedSquare extends Thread implements WindowListener, KeyListener, MouseListener, GLEventListener {
 
diff --git a/src/demos/es1/angeles/Main.java b/src/demos/es1/angeles/Main.java
index 40e24d0..01c78ba 100755
--- a/src/demos/es1/angeles/Main.java
+++ b/src/demos/es1/angeles/Main.java
@@ -3,8 +3,8 @@ package demos.es1.angeles;
 import java.nio.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class Main implements WindowListener, MouseListener {
 
diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java
index 9197b85..7aadecb 100644
--- a/src/demos/es1/cube/Cube.java
+++ b/src/demos/es1/cube/Cube.java
@@ -39,8 +39,8 @@ import javax.media.nativewindow.*;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class Cube implements GLEventListener {
     public boolean glDebug = false ;
diff --git a/src/demos/es1/cube/CubeImmModeSink.java b/src/demos/es1/cube/CubeImmModeSink.java
index 8b6092c..79c1fd6 100644
--- a/src/demos/es1/cube/CubeImmModeSink.java
+++ b/src/demos/es1/cube/CubeImmModeSink.java
@@ -38,8 +38,8 @@ import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.glsl.fixedfunc.*;
 import java.nio.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class CubeImmModeSink implements GLEventListener {
     boolean quit = false;
diff --git a/src/demos/es1/cubefbo/Main.java b/src/demos/es1/cubefbo/Main.java
index 44aa4d2..e95be25 100755
--- a/src/demos/es1/cubefbo/Main.java
+++ b/src/demos/es1/cubefbo/Main.java
@@ -3,8 +3,8 @@ package demos.es1.cubefbo;
 import java.nio.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class Main implements WindowListener, MouseListener {
 
diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java
index 958f118..0e7a27c 100755
--- a/src/demos/es2/RedSquare.java
+++ b/src/demos/es2/RedSquare.java
@@ -8,8 +8,8 @@ import javax.media.nativewindow.*;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.glsl.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class RedSquare extends Thread implements WindowListener, KeyListener, MouseListener, GLEventListener {
 
diff --git a/src/demos/es2/openmax/Cube.java b/src/demos/es2/openmax/Cube.java
index 620ce88..2337d16 100644
--- a/src/demos/es2/openmax/Cube.java
+++ b/src/demos/es2/openmax/Cube.java
@@ -39,8 +39,8 @@ import javax.media.nativewindow.*;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class Cube implements GLEventListener {
     boolean quit = false;
diff --git a/src/demos/es2/openmax/MovieCube.java b/src/demos/es2/openmax/MovieCube.java
index 197b2c9..c8ac4cc 100755
--- a/src/demos/es2/openmax/MovieCube.java
+++ b/src/demos/es2/openmax/MovieCube.java
@@ -38,13 +38,13 @@ package demos.es2.openmax;
 import javax.media.opengl.*;
 import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
-import com.sun.openmax.*;
+import com.jogamp.openmax.*;
 
 import java.nio.*;
 import java.net.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class MovieCube implements MouseListener, GLEventListener, OMXEventListener {
     GLWindow window;
diff --git a/src/demos/es2/openmax/MovieSimple.java b/src/demos/es2/openmax/MovieSimple.java
index 3bd4156..13d09fe 100755
--- a/src/demos/es2/openmax/MovieSimple.java
+++ b/src/demos/es2/openmax/MovieSimple.java
@@ -39,13 +39,13 @@ import javax.media.opengl.*;
 import com.jogamp.opengl.util.glsl.*;
 import com.jogamp.opengl.util.*;
 
-import com.sun.openmax.*;
+import com.jogamp.openmax.*;
 
 import java.nio.*;
 import java.net.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class MovieSimple implements MouseListener, GLEventListener, OMXEventListener {
     private GLWindow window;
diff --git a/src/demos/es2/perftst/PerfTextLoad.java b/src/demos/es2/perftst/PerfTextLoad.java
index d58354b..a08f4d9 100755
--- a/src/demos/es2/perftst/PerfTextLoad.java
+++ b/src/demos/es2/perftst/PerfTextLoad.java
@@ -7,8 +7,8 @@ import javax.media.opengl.*;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.texture.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class PerfTextLoad extends PerfModule {
     static final int MAX_TEXTURE_ENGINES = 8;
diff --git a/src/demos/es2/perftst/PerfUniLoad.java b/src/demos/es2/perftst/PerfUniLoad.java
index a38baa3..b2af9cb 100755
--- a/src/demos/es2/perftst/PerfUniLoad.java
+++ b/src/demos/es2/perftst/PerfUniLoad.java
@@ -4,8 +4,8 @@ import java.nio.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.util.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class PerfUniLoad extends PerfModule {
     static final int MAX_ARRAYS = 12;
diff --git a/src/demos/es2/perftst/PerfVBOLoad.java b/src/demos/es2/perftst/PerfVBOLoad.java
index ee9b251..5563ea8 100755
--- a/src/demos/es2/perftst/PerfVBOLoad.java
+++ b/src/demos/es2/perftst/PerfVBOLoad.java
@@ -4,8 +4,8 @@ import java.nio.*;
 import javax.media.opengl.*;
 import com.jogamp.opengl.util.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class PerfVBOLoad extends PerfModule {
 
diff --git a/src/demos/es2/perftst/Perftst.java b/src/demos/es2/perftst/Perftst.java
index 4d1f7e0..b0b8cdc 100755
--- a/src/demos/es2/perftst/Perftst.java
+++ b/src/demos/es2/perftst/Perftst.java
@@ -7,8 +7,8 @@ import javax.media.nativewindow.*;
 import com.jogamp.opengl.util.*;
 import com.jogamp.opengl.util.glsl.*;
 
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class Perftst implements MouseListener, GLEventListener {
 
diff --git a/src/demos/newt/NEWTTest1.java b/src/demos/newt/NEWTTest1.java
index 0cfc190..37ed038 100644
--- a/src/demos/newt/NEWTTest1.java
+++ b/src/demos/newt/NEWTTest1.java
@@ -1,7 +1,7 @@
 package demos.newt;
 
 import javax.media.nativewindow.*;
-import com.sun.javafx.newt.*;
+import com.jogamp.javafx.newt.*;
 
 public class NEWTTest1 implements WindowListener, KeyListener, MouseListener
 {
diff --git a/src/demos/newt/TaskManagerTest1.java b/src/demos/newt/TaskManagerTest1.java
index 6044cb7..3dd7ffd 100644
--- a/src/demos/newt/TaskManagerTest1.java
+++ b/src/demos/newt/TaskManagerTest1.java
@@ -1,7 +1,7 @@
 package demos.newt;
 
 import javax.media.nativewindow.*;
-import com.sun.javafx.newt.*;
+import com.jogamp.javafx.newt.*;
 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 ab6fd47..160651c 100644
--- a/src/demos/newt/TaskManagerTest2.java
+++ b/src/demos/newt/TaskManagerTest2.java
@@ -1,7 +1,7 @@
 package demos.newt;
 
 import javax.media.nativewindow.*;
-import com.sun.javafx.newt.*;
+import com.jogamp.javafx.newt.*;
 import demos.newt.util.TaskToolWM;
 
 public class TaskManagerTest2  implements WindowListener, KeyListener, MouseListener
diff --git a/src/demos/newt/util/TaskToolWM.java b/src/demos/newt/util/TaskToolWM.java
index 0f1b180..2f312f6 100644
--- a/src/demos/newt/util/TaskToolWM.java
+++ b/src/demos/newt/util/TaskToolWM.java
@@ -39,7 +39,7 @@ package demos.newt.util;
 import java.util.*;
 
 import javax.media.nativewindow.*;
-import com.sun.javafx.newt.*;
+import com.jogamp.javafx.newt.*;
 
 public class TaskToolWM {
     final static boolean externalStimuli;
diff --git a/src/demos/readbuffer/Main.java b/src/demos/readbuffer/Main.java
index e5d87a9..0757230 100755
--- a/src/demos/readbuffer/Main.java
+++ b/src/demos/readbuffer/Main.java
@@ -4,8 +4,8 @@ import java.lang.reflect.*;
 import java.nio.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
-import com.sun.javafx.newt.*;
-import com.sun.javafx.newt.opengl.*;
+import com.jogamp.javafx.newt.*;
+import com.jogamp.javafx.newt.opengl.*;
 
 public class Main implements WindowListener, MouseListener, SurfaceUpdatedListener {
 
diff --git a/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java b/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java
index 18c0bae..8ce5777 100644
--- a/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java
+++ b/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java
@@ -48,7 +48,7 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import java.nio.*;
 
-import com.sun.javafx.newt.*;
+import com.jogamp.javafx.newt.*;
 
 /**
  *
diff --git a/src/jbullet/src/javabullet/demos/opengl/JOGL.java b/src/jbullet/src/javabullet/demos/opengl/JOGL.java
index 078e9c5..723cf16 100644
--- a/src/jbullet/src/javabullet/demos/opengl/JOGL.java
+++ b/src/jbullet/src/javabullet/demos/opengl/JOGL.java
@@ -23,7 +23,7 @@
 
 package javabullet.demos.opengl;
 
-import com.sun.javafx.newt.*;
+import com.jogamp.javafx.newt.*;
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;