Merge branch 'master' of github.com:mbien/jogl-demos

75 files changed, 156 insertions, 156 deletions

diff --git a/src/demos/applets/GearsApplet.java b/src/demos/applets/GearsApplet.java
index d1470c9..fc3d0ec 100755
--- a/src/demos/applets/GearsApplet.java
+++ b/src/demos/applets/GearsApplet.java
@@ -4,8 +4,8 @@ import java.applet.*;
 import java.awt.*;
 import demos.gears.Gears;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.FPSAnimator;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.FPSAnimator;
 
 /** 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/GearsJOALApplet.java b/src/demos/applets/GearsJOALApplet.java
index 1c71e72..9cc8693 100755
--- a/src/demos/applets/GearsJOALApplet.java
+++ b/src/demos/applets/GearsJOALApplet.java
@@ -5,8 +5,8 @@ import java.applet.Applet;
 import java.awt.EventQueue;
 import java.awt.GridLayout;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.FPSAnimator;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.FPSAnimator;
 import javax.swing.JPanel;
 import net.java.games.joal.util.ALut;
 import demos.devmaster.lesson1.SingleStaticSource;
diff --git a/src/demos/applets/JOGLNewtAppletBase.java b/src/demos/applets/JOGLNewtAppletBase.java
index 428e0b2..628699d 100755
--- a/src/demos/applets/JOGLNewtAppletBase.java
+++ b/src/demos/applets/JOGLNewtAppletBase.java
@@ -7,7 +7,7 @@ import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.GLWindow;
 
 import javax.media.opengl.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.*;
 
 /** 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/cg/runtime_ogl/cgGL_vertex_example.java b/src/demos/cg/runtime_ogl/cgGL_vertex_example.java
index 3a0504f..3579f27 100644
--- a/src/demos/cg/runtime_ogl/cgGL_vertex_example.java
+++ b/src/demos/cg/runtime_ogl/cgGL_vertex_example.java
@@ -33,7 +33,7 @@
 
 package demos.cg.runtime_ogl;
 
-import com.sun.opengl.cg.*;
+import com.jogamp.opengl.cg.*;
 import javax.media.opengl.*;
 import javax.media.opengl.awt.*;
 import javax.media.opengl.glu.*;
diff --git a/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java b/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java
index 98075d9..f33168f 100644
--- a/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java
+++ b/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java
@@ -33,12 +33,12 @@
 
 package demos.cg.runtime_ogl_vertex_fragment;
 
-import com.sun.opengl.cg.*;
+import com.jogamp.opengl.cg.*;
 import javax.media.opengl.*;
 import javax.media.opengl.awt.*;
 import javax.media.opengl.glu.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.*;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/src/demos/context/DualContext.java b/src/demos/context/DualContext.java
index c7d734c..d77c49a 100755
--- a/src/demos/context/DualContext.java
+++ b/src/demos/context/DualContext.java
@@ -39,7 +39,7 @@
 
 package demos.context;
 
-import com.sun.opengl.util.gl2.GLUT;
+import com.jogamp.opengl.util.gl2.GLUT;
 import java.awt.BorderLayout;
 import java.awt.Canvas;
 import java.awt.Graphics;
diff --git a/src/demos/cubefbo/CubeObject.java b/src/demos/cubefbo/CubeObject.java
index e12bdc2..bf3f8bc 100755
--- a/src/demos/cubefbo/CubeObject.java
+++ b/src/demos/cubefbo/CubeObject.java
@@ -38,7 +38,7 @@ import java.nio.ShortBuffer;
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2ES1;
 import javax.media.opengl.GL2;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.BufferUtil;
 
 class CubeObject {
     public CubeObject (boolean useTexCoords) {
diff --git a/src/demos/cubefbo/FBCubes.java b/src/demos/cubefbo/FBCubes.java
index c27877d..39494a0 100755
--- a/src/demos/cubefbo/FBCubes.java
+++ b/src/demos/cubefbo/FBCubes.java
@@ -43,7 +43,7 @@ import javax.media.opengl.GL2;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.FBObject;
+import com.jogamp.opengl.util.FBObject;
 
 
 
diff --git a/src/demos/cubefbo/Main.java b/src/demos/cubefbo/Main.java
index e6d0cc9..2d8a36b 100755
--- a/src/demos/cubefbo/Main.java
+++ b/src/demos/cubefbo/Main.java
@@ -38,8 +38,8 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.FPSAnimator;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.FPSAnimator;
 
 
 public class Main {
diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java
index 5f573f8..afbae11 100755
--- a/src/demos/es1/RedSquare.java
+++ b/src/demos/es1/RedSquare.java
@@ -6,8 +6,8 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.nativewindow.*;
 
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/es1/angeles/AngelesES1.java b/src/demos/es1/angeles/AngelesES1.java
index bfb4a78..edba727 100755
--- a/src/demos/es1/angeles/AngelesES1.java
+++ b/src/demos/es1/angeles/AngelesES1.java
@@ -26,7 +26,7 @@ package demos.es1.angeles;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.*;
 import java.nio.*;
 
 public class AngelesES1 implements GLEventListener {
diff --git a/src/demos/es1/angeles/AngelesGL.java b/src/demos/es1/angeles/AngelesGL.java
index 12206de..afcc356 100755
--- a/src/demos/es1/angeles/AngelesGL.java
+++ b/src/demos/es1/angeles/AngelesGL.java
@@ -26,8 +26,8 @@ package demos.es1.angeles;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 import java.nio.*;
 
 public class AngelesGL implements GLEventListener {
diff --git a/src/demos/es1/angeles/AngelesGLil.java b/src/demos/es1/angeles/AngelesGLil.java
index aaae01e..bbfb86a 100755
--- a/src/demos/es1/angeles/AngelesGLil.java
+++ b/src/demos/es1/angeles/AngelesGLil.java
@@ -26,8 +26,8 @@ package demos.es1.angeles;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 import java.nio.*;
 
 public class AngelesGLil implements GLEventListener {
diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java
index d46f41b..9197b85 100644
--- a/src/demos/es1/cube/Cube.java
+++ b/src/demos/es1/cube/Cube.java
@@ -36,8 +36,8 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.nativewindow.*;
 
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/es1/cube/CubeImmModeSink.java b/src/demos/es1/cube/CubeImmModeSink.java
index cf22e90..8b6092c 100644
--- a/src/demos/es1/cube/CubeImmModeSink.java
+++ b/src/demos/es1/cube/CubeImmModeSink.java
@@ -34,8 +34,8 @@ package demos.es1.cube;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.nativewindow.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 import java.nio.*;
 
 import com.sun.javafx.newt.*;
diff --git a/src/demos/es1/cubefbo/FBCubes.java b/src/demos/es1/cubefbo/FBCubes.java
index ecef02d..b6a1b0d 100755
--- a/src/demos/es1/cubefbo/FBCubes.java
+++ b/src/demos/es1/cubefbo/FBCubes.java
@@ -36,8 +36,8 @@ package demos.es1.cubefbo;
 import demos.es1.cube.Cube;
 import java.nio.*;
 import javax.media.opengl.*;
-import com.sun.opengl.util.FBObject;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.FBObject;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
 public class FBCubes implements GLEventListener {
     private static final int FBO_SIZE = 256;
diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java
index 65f70c2..958f118 100755
--- a/src/demos/es2/RedSquare.java
+++ b/src/demos/es2/RedSquare.java
@@ -5,8 +5,8 @@ import java.util.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/es2/openmax/Cube.java b/src/demos/es2/openmax/Cube.java
index 46d25c1..620ce88 100644
--- a/src/demos/es2/openmax/Cube.java
+++ b/src/demos/es2/openmax/Cube.java
@@ -36,8 +36,8 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.nativewindow.*;
 
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/es2/openmax/MovieCube.java b/src/demos/es2/openmax/MovieCube.java
index 40ba583..197b2c9 100755
--- a/src/demos/es2/openmax/MovieCube.java
+++ b/src/demos/es2/openmax/MovieCube.java
@@ -36,7 +36,7 @@ package demos.es2.openmax;
 // import demos.es1.cube.Cube;
 
 import javax.media.opengl.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
 import com.sun.openmax.*;
 
@@ -181,7 +181,7 @@ public class MovieCube implements MouseListener, GLEventListener, OMXEventListen
     public void display(GLAutoDrawable drawable) {
         GL2ES1 gl = drawable.getGL().getGL2ES1();
 
-        com.sun.opengl.util.texture.Texture tex = null;
+        com.jogamp.opengl.util.texture.Texture tex = null;
         if(null!=movie) {
             tex=movie.getNextTextureID();
             if(null!=tex) {
diff --git a/src/demos/es2/openmax/MovieSimple.java b/src/demos/es2/openmax/MovieSimple.java
index 9088977..3bd4156 100755
--- a/src/demos/es2/openmax/MovieSimple.java
+++ b/src/demos/es2/openmax/MovieSimple.java
@@ -36,8 +36,8 @@ package demos.es2.openmax;
 
 import javax.media.opengl.*;
 
-import com.sun.opengl.util.glsl.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.glsl.*;
+import com.jogamp.opengl.util.*;
 
 import com.sun.openmax.*;
 
@@ -321,7 +321,7 @@ public class MovieSimple implements MouseListener, GLEventListener, OMXEventList
         }
 
 
-        com.sun.opengl.util.texture.Texture tex = null;
+        com.jogamp.opengl.util.texture.Texture tex = null;
         if(null!=movie) {
             tex=movie.getNextTextureID();
             if(null!=tex) {
diff --git a/src/demos/es2/perftst/PerfModule.java b/src/demos/es2/perftst/PerfModule.java
index 1a6cda1..69b9f1a 100644
--- a/src/demos/es2/perftst/PerfModule.java
+++ b/src/demos/es2/perftst/PerfModule.java
@@ -3,8 +3,8 @@ package demos.es2.perftst;
 import java.nio.*;
 import javax.media.opengl.*;
 
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.*;
 
 public abstract class PerfModule {
 
diff --git a/src/demos/es2/perftst/PerfTextLoad.java b/src/demos/es2/perftst/PerfTextLoad.java
index b22266a..d58354b 100755
--- a/src/demos/es2/perftst/PerfTextLoad.java
+++ b/src/demos/es2/perftst/PerfTextLoad.java
@@ -4,8 +4,8 @@ import java.nio.*;
 import java.io.*;
 import java.net.*;
 import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/es2/perftst/PerfUniLoad.java b/src/demos/es2/perftst/PerfUniLoad.java
index a87d386..a38baa3 100755
--- a/src/demos/es2/perftst/PerfUniLoad.java
+++ b/src/demos/es2/perftst/PerfUniLoad.java
@@ -2,7 +2,7 @@ package demos.es2.perftst;
 
 import java.nio.*;
 import javax.media.opengl.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/es2/perftst/PerfVBOLoad.java b/src/demos/es2/perftst/PerfVBOLoad.java
index 376ab0a..ee9b251 100755
--- a/src/demos/es2/perftst/PerfVBOLoad.java
+++ b/src/demos/es2/perftst/PerfVBOLoad.java
@@ -2,7 +2,7 @@ package demos.es2.perftst;
 
 import java.nio.*;
 import javax.media.opengl.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/es2/perftst/Perftst.java b/src/demos/es2/perftst/Perftst.java
index 06520df..4d1f7e0 100755
--- a/src/demos/es2/perftst/Perftst.java
+++ b/src/demos/es2/perftst/Perftst.java
@@ -4,8 +4,8 @@ import java.nio.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/fullscreen/GearsFullscreen.java b/src/demos/fullscreen/GearsFullscreen.java
index 2bbf158..0dac67f 100755
--- a/src/demos/fullscreen/GearsFullscreen.java
+++ b/src/demos/fullscreen/GearsFullscreen.java
@@ -6,7 +6,7 @@ import java.awt.event.*;
 import demos.gears.Gears;
 import demos.util.*;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 
 /**
  * GearsFullscreen.java <BR>
diff --git a/src/demos/fullscreen/GearsFullscreen2.java b/src/demos/fullscreen/GearsFullscreen2.java
index 8b050df..38911a4 100755
--- a/src/demos/fullscreen/GearsFullscreen2.java
+++ b/src/demos/fullscreen/GearsFullscreen2.java
@@ -11,7 +11,7 @@ import java.awt.GraphicsEnvironment;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.ToolTipManager;
diff --git a/src/demos/fullscreen/JGearsFullscreen.java b/src/demos/fullscreen/JGearsFullscreen.java
index 92e0769..f540a12 100755
--- a/src/demos/fullscreen/JGearsFullscreen.java
+++ b/src/demos/fullscreen/JGearsFullscreen.java
@@ -11,7 +11,7 @@ import java.awt.GraphicsEnvironment;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.media.opengl.awt.GLJPanel;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 
diff --git a/src/demos/gamma/TestGamma.java b/src/demos/gamma/TestGamma.java
index 6cc1801..4dff454 100755
--- a/src/demos/gamma/TestGamma.java
+++ b/src/demos/gamma/TestGamma.java
@@ -45,8 +45,8 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.media.opengl.*;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.Gamma;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.Gamma;
 
 
 
diff --git a/src/demos/gears/Gears.java b/src/demos/gears/Gears.java
index 2107014..227ce87 100644
--- a/src/demos/gears/Gears.java
+++ b/src/demos/gears/Gears.java
@@ -15,7 +15,7 @@ import javax.media.opengl.GLEventListener;
 import javax.media.opengl.awt.AWTGLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.awt.GLJPanel;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 
 /**
  * Gears.java <BR>
diff --git a/src/demos/hdr/CgPipeline.java b/src/demos/hdr/CgPipeline.java
index 56906f1..f46c693 100755
--- a/src/demos/hdr/CgPipeline.java
+++ b/src/demos/hdr/CgPipeline.java
@@ -4,7 +4,7 @@ import java.io.*;
 import java.util.*;
 
 import javax.media.opengl.*;
-import com.sun.opengl.cg.*;
+import com.jogamp.opengl.cg.*;
 import demos.util.*;
 
 public class CgPipeline implements Pipeline {
diff --git a/src/demos/hdr/HDR.java b/src/demos/hdr/HDR.java
index bd3f7d6..aca38e9 100755
--- a/src/demos/hdr/HDR.java
+++ b/src/demos/hdr/HDR.java
@@ -1,7 +1,7 @@
 package demos.hdr;
 
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.gl2.GLUT;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.gl2.GLUT;
 import demos.common.Demo;
 import demos.common.DemoListener;
 import demos.util.DurationTimer;
diff --git a/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java b/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
index 3190778..6760161 100644
--- a/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
+++ b/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
@@ -33,9 +33,9 @@
 
 package demos.hwShadowmapsSimple;
 
-import com.sun.opengl.util.gl2.GLUT;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.gl2.GLUT;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureIO;
 import demos.common.Demo;
 import demos.common.DemoListener;
 import gleem.BSphere;
diff --git a/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java b/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java
index c0feeb1..e445b39 100644
--- a/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java
+++ b/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java
@@ -33,7 +33,7 @@
 
 package demos.infiniteShadowVolumes;
 
-import com.sun.opengl.util.gl2.GLUT;
+import com.jogamp.opengl.util.gl2.GLUT;
 import demos.common.Demo;
 import demos.common.DemoListener;
 import demos.util.MD2;
diff --git a/src/demos/j2d/CustomText.java b/src/demos/j2d/CustomText.java
index c3194be..b5a4f57 100755
--- a/src/demos/j2d/CustomText.java
+++ b/src/demos/j2d/CustomText.java
@@ -39,11 +39,11 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.TextRenderer;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.texture.TextureIO;
-import com.sun.opengl.util.texture.awt.AWTTextureIO;
+import com.jogamp.opengl.util.awt.TextRenderer;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
 import demos.common.Demo;
 import demos.util.FPSCounter;
 import demos.util.SystemTime;
@@ -75,7 +75,7 @@ import javax.media.opengl.GL2;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
diff --git a/src/demos/j2d/FlyingText.java b/src/demos/j2d/FlyingText.java
index d8d156c..9648d4f 100755
--- a/src/demos/j2d/FlyingText.java
+++ b/src/demos/j2d/FlyingText.java
@@ -39,11 +39,11 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.TextRenderer;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.texture.TextureIO;
-import com.sun.opengl.util.texture.awt.AWTTextureIO;
+import com.jogamp.opengl.util.awt.TextRenderer;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
 import demos.common.Demo;
 import demos.util.FPSCounter;
 import demos.util.SystemTime;
@@ -71,7 +71,7 @@ import javax.media.opengl.GL2;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
diff --git a/src/demos/j2d/TestOverlay.java b/src/demos/j2d/TestOverlay.java
index f2c248d..13cb39e 100755
--- a/src/demos/j2d/TestOverlay.java
+++ b/src/demos/j2d/TestOverlay.java
@@ -39,7 +39,7 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.Overlay;
+import com.jogamp.opengl.util.awt.Overlay;
 import demos.gears.Gears;
 import demos.util.*;
 import gleem.linalg.*;
@@ -59,7 +59,7 @@ import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 
 /** A simple test of the Overlay utility class. Draws gears underneath
     with moving Java 2D-rendered text on top. */
diff --git a/src/demos/j2d/TestTextRenderer.java b/src/demos/j2d/TestTextRenderer.java
index 2d88a2d..5d93558 100755
--- a/src/demos/j2d/TestTextRenderer.java
+++ b/src/demos/j2d/TestTextRenderer.java
@@ -39,7 +39,7 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.TextRenderer;
+import com.jogamp.opengl.util.awt.TextRenderer;
 import demos.gears.Gears;
 import demos.util.FPSCounter;
 import demos.util.SystemTime;
@@ -55,7 +55,7 @@ import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 
 
 
diff --git a/src/demos/j2d/TestTextureRenderer.java b/src/demos/j2d/TestTextureRenderer.java
index f85cce4..60bb3a4 100755
--- a/src/demos/j2d/TestTextureRenderer.java
+++ b/src/demos/j2d/TestTextureRenderer.java
@@ -39,7 +39,7 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.TextureRenderer;
+import com.jogamp.opengl.util.awt.TextureRenderer;
 import demos.gears.Gears;
 import demos.util.SystemTime;
 import demos.util.Time;
@@ -62,7 +62,7 @@ import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 
 
 
diff --git a/src/demos/j2d/TextCube.java b/src/demos/j2d/TextCube.java
index 0c97650..63ad427 100755
--- a/src/demos/j2d/TextCube.java
+++ b/src/demos/j2d/TextCube.java
@@ -39,7 +39,7 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.TextRenderer;
+import com.jogamp.opengl.util.awt.TextRenderer;
 import demos.common.Demo;
 import demos.util.FPSCounter;
 import demos.util.SystemTime;
@@ -59,7 +59,7 @@ import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 
 
 
diff --git a/src/demos/j2d/TextFlow.java b/src/demos/j2d/TextFlow.java
index f3f4524..972618a 100755
--- a/src/demos/j2d/TextFlow.java
+++ b/src/demos/j2d/TextFlow.java
@@ -39,7 +39,7 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.TextRenderer;
+import com.jogamp.opengl.util.awt.TextRenderer;
 import demos.common.Demo;
 import demos.util.SystemTime;
 import demos.util.Time;
@@ -63,7 +63,7 @@ import javax.media.opengl.GLProfile;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 
 
 /** Illustrates both the TextRenderer's capability for handling
diff --git a/src/demos/jgears/JGears.java b/src/demos/jgears/JGears.java
index e885bd5..7e7d2e2 100644
--- a/src/demos/jgears/JGears.java
+++ b/src/demos/jgears/JGears.java
@@ -21,7 +21,7 @@ import javax.imageio.ImageIO;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLJPanel;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 import javax.swing.JCheckBox;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
diff --git a/src/demos/jrefract/JRefract.java b/src/demos/jrefract/JRefract.java
index 32f8860..cdef67d 100755
--- a/src/demos/jrefract/JRefract.java
+++ b/src/demos/jrefract/JRefract.java
@@ -58,8 +58,8 @@ import java.awt.event.WindowEvent;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLJPanel;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.FPSAnimator;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.FPSAnimator;
 import javax.swing.JCheckBox;
 import javax.swing.JDesktopPane;
 import javax.swing.JFrame;
diff --git a/src/demos/misc/GLCapsTableDemo.java b/src/demos/misc/GLCapsTableDemo.java
index bc77c0b..d4c652a 100755
--- a/src/demos/misc/GLCapsTableDemo.java
+++ b/src/demos/misc/GLCapsTableDemo.java
@@ -18,7 +18,7 @@ import javax.media.opengl.DefaultGLCapabilitiesChooser;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLCapabilitiesChooser;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.FPSAnimator;
+import com.jogamp.opengl.util.FPSAnimator;
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JFrame;
diff --git a/src/demos/misc/Picking.java b/src/demos/misc/Picking.java
index fde486c..27a0fe2 100755
--- a/src/demos/misc/Picking.java
+++ b/src/demos/misc/Picking.java
@@ -17,8 +17,8 @@ import java.nio.*;
 import javax.media.opengl.*;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.*;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.BufferUtil;
 
 public class Picking
 {
diff --git a/src/demos/misc/TiledRendering.java b/src/demos/misc/TiledRendering.java
index a5034fa..44035fd 100755
--- a/src/demos/misc/TiledRendering.java
+++ b/src/demos/misc/TiledRendering.java
@@ -1,9 +1,9 @@
 package demos.misc;
 
-import com.sun.opengl.util.FileUtil;
-import com.sun.opengl.util.TGAWriter;
-import com.sun.opengl.util.awt.ImageUtil;
-import com.sun.opengl.util.gl2.TileRenderer;
+import com.jogamp.opengl.util.FileUtil;
+import com.jogamp.opengl.util.TGAWriter;
+import com.jogamp.opengl.util.awt.ImageUtil;
+import com.jogamp.opengl.util.gl2.TileRenderer;
 import demos.gears.Gears;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
diff --git a/src/demos/nurbs/curveapp/GLListener.java b/src/demos/nurbs/curveapp/GLListener.java
index 3a1f47a..473b4ed 100755
--- a/src/demos/nurbs/curveapp/GLListener.java
+++ b/src/demos/nurbs/curveapp/GLListener.java
@@ -5,7 +5,7 @@ import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.glu.*;
 
-import com.sun.opengl.util.GLUT;
+import com.jogamp.opengl.util.GLUT;
 
 /**
  * Listener raacting to OpenGL canvas events
diff --git a/src/demos/nurbs/icons/IconFactory.java b/src/demos/nurbs/icons/IconFactory.java
index 81c906a..d6edcab 100755
--- a/src/demos/nurbs/icons/IconFactory.java
+++ b/src/demos/nurbs/icons/IconFactory.java
@@ -1,6 +1,6 @@
 package demos.nurbs.icons;
 
-import com.sun.opengl.impl.io.StreamUtil;
+import com.jogamp.opengl.impl.io.StreamUtil;
 import java.io.*;
 import javax.swing.ImageIcon;
 
diff --git a/src/demos/nurbs/surfaceapp/GLListener.java b/src/demos/nurbs/surfaceapp/GLListener.java
index ced405d..54e7c9d 100755
--- a/src/demos/nurbs/surfaceapp/GLListener.java
+++ b/src/demos/nurbs/surfaceapp/GLListener.java
@@ -5,7 +5,7 @@ import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.glu.*;
 
-import com.sun.opengl.util.glut.gl2.GLUTgl2;
+import com.jogamp.opengl.util.glut.gl2.GLUTgl2;
 import javax.media.opengl.GL2ES1;
 import javax.media.opengl.GL2;
 
diff --git a/src/demos/particles/engine/Engine.java b/src/demos/particles/engine/Engine.java
index 2b60175..d769457 100755
--- a/src/demos/particles/engine/Engine.java
+++ b/src/demos/particles/engine/Engine.java
@@ -37,7 +37,7 @@
 package demos.particles.engine;
 
 import javax.media.opengl.*;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.*;
 import java.net.*;
 import java.util.*;
 import java.io.*;
diff --git a/src/demos/particles/engine/GLComponent.java b/src/demos/particles/engine/GLComponent.java
index 43c3501..7194861 100755
--- a/src/demos/particles/engine/GLComponent.java
+++ b/src/demos/particles/engine/GLComponent.java
@@ -40,7 +40,7 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.opengl.awt.*;
 
-import com.sun.opengl.util.FPSAnimator;
+import com.jogamp.opengl.util.FPSAnimator;
 
 public class GLComponent extends GLCanvas implements GLEventListener {
     
diff --git a/src/demos/particles/engine/Particle.java b/src/demos/particles/engine/Particle.java
index ad4955e..d9858dd 100755
--- a/src/demos/particles/engine/Particle.java
+++ b/src/demos/particles/engine/Particle.java
@@ -36,7 +36,7 @@
 
 package demos.particles.engine;
 
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.*;
 
 import javax.media.opengl.*;
 
diff --git a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
index a813906..d0e73ae 100644
--- a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
+++ b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
@@ -57,7 +57,7 @@ import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLException;
 import javax.media.opengl.awt.AWTGLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 import javax.swing.JOptionPane;
 
 /**
diff --git a/src/demos/proceduralTexturePhysics/Water.java b/src/demos/proceduralTexturePhysics/Water.java
index 3a5d1a8..fdf4224 100644
--- a/src/demos/proceduralTexturePhysics/Water.java
+++ b/src/demos/proceduralTexturePhysics/Water.java
@@ -33,10 +33,10 @@
 
 package demos.proceduralTexturePhysics;
 
-import com.sun.opengl.util.FileUtil;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.FileUtil;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
 import demos.util.Cubemap;
 import gleem.linalg.Mat4f;
 import gleem.linalg.Rotf;
@@ -56,7 +56,7 @@ import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLException;
 import javax.media.opengl.GLPbuffer;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.BufferUtil;
 
 
 
diff --git a/src/demos/readbuffer/ReadBuffer2File.java b/src/demos/readbuffer/ReadBuffer2File.java
index ef908c4..9e0edf9 100755
--- a/src/demos/readbuffer/ReadBuffer2File.java
+++ b/src/demos/readbuffer/ReadBuffer2File.java
@@ -36,8 +36,8 @@ package demos.readbuffer;
 import java.nio.*;
 import javax.media.opengl.*;
 
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
 import java.io.File;
 import java.io.IOException;
 
diff --git a/src/demos/readbuffer/ReadBuffer2Screen.java b/src/demos/readbuffer/ReadBuffer2Screen.java
index 4d10fcc..39a4a27 100755
--- a/src/demos/readbuffer/ReadBuffer2Screen.java
+++ b/src/demos/readbuffer/ReadBuffer2Screen.java
@@ -37,16 +37,16 @@ import java.nio.*;
 import javax.media.opengl.*;
 import javax.media.opengl.fixedfunc.*;
 
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
 import javax.media.opengl.fixedfunc.GLPointerFunc;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.GLArrayDataClient;
-import com.sun.opengl.util.GLArrayDataServer;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.GLArrayDataClient;
+import com.jogamp.opengl.util.GLArrayDataServer;
+import com.jogamp.opengl.util.BufferUtil;
 
 public class ReadBuffer2Screen extends ReadBufferBase {
     PMVMatrix pmvMatrix;
diff --git a/src/demos/readbuffer/ReadBufferBase.java b/src/demos/readbuffer/ReadBufferBase.java
index 04c1cdc..53f2ba9 100755
--- a/src/demos/readbuffer/ReadBufferBase.java
+++ b/src/demos/readbuffer/ReadBufferBase.java
@@ -36,9 +36,9 @@ package demos.readbuffer;
 import java.nio.*;
 import javax.media.opengl.*;
 
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.BufferUtil;
 
 
 public class ReadBufferBase implements GLEventListener {
diff --git a/src/demos/readbuffer/ReadBufferUtil.java b/src/demos/readbuffer/ReadBufferUtil.java
index bef8473..5cba034 100755
--- a/src/demos/readbuffer/ReadBufferUtil.java
+++ b/src/demos/readbuffer/ReadBufferUtil.java
@@ -36,9 +36,9 @@ package demos.readbuffer;
 import java.nio.*;
 import javax.media.opengl.*;
 
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.BufferUtil;
 
 public class ReadBufferUtil {
     protected int readPixelSizeLast = 0;
diff --git a/src/demos/readbuffer/Surface2File.java b/src/demos/readbuffer/Surface2File.java
index f03918c..ec41039 100755
--- a/src/demos/readbuffer/Surface2File.java
+++ b/src/demos/readbuffer/Surface2File.java
@@ -36,9 +36,9 @@ package demos.readbuffer;
 import java.nio.*;
 import javax.media.opengl.*;
 
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.BufferUtil;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/demos/testContextDestruction/TestContextDestruction.java b/src/demos/testContextDestruction/TestContextDestruction.java
index a012639..f1e8649 100755
--- a/src/demos/testContextDestruction/TestContextDestruction.java
+++ b/src/demos/testContextDestruction/TestContextDestruction.java
@@ -57,7 +57,7 @@ import javax.media.opengl.GL2;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 
diff --git a/src/demos/texture/TestSubImage.java b/src/demos/texture/TestSubImage.java
index bf1e936..498428c 100755
--- a/src/demos/texture/TestSubImage.java
+++ b/src/demos/texture/TestSubImage.java
@@ -39,11 +39,11 @@
 
 package demos.texture;
 
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
-import com.sun.opengl.util.texture.awt.AWTTextureIO;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
 import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.GradientPaint;
diff --git a/src/demos/texture/TestTexture.java b/src/demos/texture/TestTexture.java
index 3ece9ef..6d39bbc 100755
--- a/src/demos/texture/TestTexture.java
+++ b/src/demos/texture/TestTexture.java
@@ -39,9 +39,9 @@
 
 package demos.texture;
 
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureIO;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.InputEvent;
diff --git a/src/demos/texture/TextureConvert.java b/src/demos/texture/TextureConvert.java
index df15fc2..03c7357 100755
--- a/src/demos/texture/TextureConvert.java
+++ b/src/demos/texture/TextureConvert.java
@@ -39,10 +39,10 @@
 
 package demos.texture;
 
-import com.sun.opengl.util.FileUtil;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.FileUtil;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
 import java.io.File;
 import java.io.IOException;
 import javax.media.opengl.GL;
diff --git a/src/demos/util/Cubemap.java b/src/demos/util/Cubemap.java
index 6c1a332..9f31b9a 100755
--- a/src/demos/util/Cubemap.java
+++ b/src/demos/util/Cubemap.java
@@ -39,10 +39,10 @@
 
 package demos.util;
 
-import com.sun.opengl.util.FileUtil;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.FileUtil;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
 import java.io.IOException;
 import javax.media.opengl.GL;
 import javax.media.opengl.GLException;
diff --git a/src/demos/util/DxTex.java b/src/demos/util/DxTex.java
index fbe1963..04cf4e9 100644
--- a/src/demos/util/DxTex.java
+++ b/src/demos/util/DxTex.java
@@ -47,7 +47,7 @@ import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.filechooser.*;
 
-import com.sun.opengl.util.texture.spi.*;
+import com.jogamp.opengl.util.texture.spi.*;
 
 /** Simplified clone of DxTex tool from the DirectX SDK, written in
     Java using the DDSImage; tests fetching of texture data */
diff --git a/src/demos/util/FPSCounter.java b/src/demos/util/FPSCounter.java
index 79ea38b..a625b3b 100755
--- a/src/demos/util/FPSCounter.java
+++ b/src/demos/util/FPSCounter.java
@@ -39,8 +39,8 @@
 
 package demos.util;
 
-import com.sun.opengl.util.awt.TextRenderer;
-import com.sun.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.awt.TextRenderer;
+import com.jogamp.opengl.util.texture.Texture;
 import java.awt.Font;
 import java.awt.geom.Rectangle2D;
 import java.text.DecimalFormat;
diff --git a/src/demos/util/ObjReader.java b/src/demos/util/ObjReader.java
index 75a2d08..b78baf0 100644
--- a/src/demos/util/ObjReader.java
+++ b/src/demos/util/ObjReader.java
@@ -52,7 +52,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.BufferUtil;
 
 
 
diff --git a/src/demos/vertexBufferObject/VertexBufferObject.java b/src/demos/vertexBufferObject/VertexBufferObject.java
index 0bc8b10..9c8bb26 100644
--- a/src/demos/vertexBufferObject/VertexBufferObject.java
+++ b/src/demos/vertexBufferObject/VertexBufferObject.java
@@ -56,8 +56,8 @@ import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.AWTGLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.BufferUtil;
 import javax.swing.JOptionPane;
 
 
diff --git a/src/demos/vertexProgRefract/VertexProgRefract.java b/src/demos/vertexProgRefract/VertexProgRefract.java
index fa71f0c..54c0d5e 100644
--- a/src/demos/vertexProgRefract/VertexProgRefract.java
+++ b/src/demos/vertexProgRefract/VertexProgRefract.java
@@ -33,8 +33,8 @@
 
 package demos.vertexProgRefract;
 
-import com.sun.opengl.util.gl2.GLUT;
-import com.sun.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.gl2.GLUT;
+import com.jogamp.opengl.util.texture.Texture;
 import demos.common.Demo;
 import demos.common.DemoListener;
 import demos.util.Bunny;
@@ -57,8 +57,8 @@ import java.io.IOException;
 import javax.media.opengl.*;
 import javax.media.opengl.awt.*;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.BufferUtil;
 import javax.swing.JOptionPane;
 
 
diff --git a/src/demos/vertexProgWarp/VertexProgWarp.java b/src/demos/vertexProgWarp/VertexProgWarp.java
index 8ab7166..6f917ed 100644
--- a/src/demos/vertexProgWarp/VertexProgWarp.java
+++ b/src/demos/vertexProgWarp/VertexProgWarp.java
@@ -59,8 +59,8 @@ import javax.media.opengl.awt.AWTGLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
 import javax.media.opengl.glu.GLUquadric;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.BufferUtil;
 import javax.swing.JOptionPane;
 
 
diff --git a/src/demos/xtrans/OffscreenComponentWrapper.java b/src/demos/xtrans/OffscreenComponentWrapper.java
index 47b7995..806b417 100755
--- a/src/demos/xtrans/OffscreenComponentWrapper.java
+++ b/src/demos/xtrans/OffscreenComponentWrapper.java
@@ -46,9 +46,9 @@ import java.awt.Rectangle;
 import javax.swing.JComponent;
 
 // Internal JOGL API references
-import com.sun.opengl.impl.Debug;
+import com.jogamp.opengl.impl.Debug;
 // FIXME: debugging only
-import com.sun.opengl.impl.awt.Java2D;
+import com.jogamp.opengl.impl.awt.Java2D;
 
 /** Provides an interposition point where we can install a new
  * Graphics object in the rendering pipeline. Because lightweight
diff --git a/src/demos/xtrans/OffscreenDesktopManager.java b/src/demos/xtrans/OffscreenDesktopManager.java
index 72349df..f12136c 100755
--- a/src/demos/xtrans/OffscreenDesktopManager.java
+++ b/src/demos/xtrans/OffscreenDesktopManager.java
@@ -61,9 +61,9 @@ import javax.swing.JLayeredPane;
 import javax.swing.JPanel;
 
 // Internal JOGL API references
-import com.sun.opengl.impl.Debug;
+import com.jogamp.opengl.impl.Debug;
 // FIXME: debugging only
-import com.sun.opengl.impl.awt.Java2D;
+import com.jogamp.opengl.impl.awt.Java2D;
 
 // FIXME: we need a way to lock a portion of the off-screen back
 // buffer to be persistent for a while during component removals. It
diff --git a/src/demos/xtrans/OffscreenDesktopPane.java b/src/demos/xtrans/OffscreenDesktopPane.java
index 7bd1f6c..f72e5dc 100755
--- a/src/demos/xtrans/OffscreenDesktopPane.java
+++ b/src/demos/xtrans/OffscreenDesktopPane.java
@@ -45,7 +45,7 @@ import java.util.*;
 import javax.swing.*;
 
 // Internal JOGL API references
-import com.sun.opengl.impl.Debug;
+import com.jogamp.opengl.impl.Debug;
 
 /** A subclass of JDesktopPane which performs all of the rendering of
  * its child components into an off-screen buffer. Provides access to
diff --git a/src/demos/xtrans/XTDesktopManager.java b/src/demos/xtrans/XTDesktopManager.java
index 0081b5c..92b73a2 100755
--- a/src/demos/xtrans/XTDesktopManager.java
+++ b/src/demos/xtrans/XTDesktopManager.java
@@ -39,7 +39,7 @@
 
 package demos.xtrans;
 
-import com.sun.opengl.impl.awt.Java2D;
+import com.jogamp.opengl.impl.awt.Java2D;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Image;
diff --git a/src/demos/xtrans/XTDesktopPane.java b/src/demos/xtrans/XTDesktopPane.java
index ba9dc61..c6166aa 100755
--- a/src/demos/xtrans/XTDesktopPane.java
+++ b/src/demos/xtrans/XTDesktopPane.java
@@ -39,7 +39,7 @@
 
 package demos.xtrans;
 
-import com.sun.opengl.impl.awt.Java2D;
+import com.jogamp.opengl.impl.awt.Java2D;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Point;