Refactored AWT dependencies in Animator class differently to allow

both Animator and FPSAnimator to pick up AWT behavior when available.
Moved Animator and FPSAnimator back to com.sun.opengl.util package as
it is unclear whether these classes are useful enough on all platforms
and profiles to warrant inclusion in the public specification. Updated
demos.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JOGL_2_SANDBOX@311 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

25 files changed, 29 insertions, 29 deletions

diff --git a/src/demos/applets/GearsApplet.java b/src/demos/applets/GearsApplet.java
index bc65d74..d1470c9 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 javax.media.opengl.util.Animator;
-import javax.media.opengl.util.FPSAnimator;
+import com.sun.opengl.util.Animator;
+import com.sun.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 759c49a..1c71e72 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 javax.media.opengl.util.Animator;
-import javax.media.opengl.util.FPSAnimator;
+import com.sun.opengl.util.Animator;
+import com.sun.opengl.util.FPSAnimator;
 import javax.swing.JPanel;
 import net.java.games.joal.util.ALut;
 import demos.devmaster.lesson1.SingleStaticSource;
diff --git a/src/demos/cubefbo/Main.java b/src/demos/cubefbo/Main.java
index 57e8947..34a7e0c 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 javax.media.opengl.util.Animator;
-import javax.media.opengl.util.FPSAnimator;
+import com.sun.opengl.util.Animator;
+import com.sun.opengl.util.FPSAnimator;
 
 
 public class Main {
diff --git a/src/demos/fullscreen/GearsFullscreen.java b/src/demos/fullscreen/GearsFullscreen.java
index 5e574be..2bbf158 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 javax.media.opengl.util.Animator;
+import com.sun.opengl.util.Animator;
 
 /**
  * GearsFullscreen.java <BR>
diff --git a/src/demos/fullscreen/GearsFullscreen2.java b/src/demos/fullscreen/GearsFullscreen2.java
index 9b08cba..8b050df 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 javax.media.opengl.util.Animator;
+import com.sun.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 d9e379f..92e0769 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 javax.media.opengl.util.Animator;
+import com.sun.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 74a63a1..6b2eea3 100755
--- a/src/demos/gamma/TestGamma.java
+++ b/src/demos/gamma/TestGamma.java
@@ -44,7 +44,7 @@ import java.awt.Frame;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.media.opengl.awt.GLCanvas;
-import javax.media.opengl.util.Animator;
+import com.sun.opengl.util.Animator;
 import javax.media.opengl.util.Gamma;
 
 
diff --git a/src/demos/gears/Gears.java b/src/demos/gears/Gears.java
index 3faa5b9..c508fef 100644
--- a/src/demos/gears/Gears.java
+++ b/src/demos/gears/Gears.java
@@ -14,7 +14,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 javax.media.opengl.util.Animator;
+import com.sun.opengl.util.Animator;
 
 /**
  * Gears.java <BR>
diff --git a/src/demos/j2d/CustomText.java b/src/demos/j2d/CustomText.java
index 9830468..d8111ac 100755
--- a/src/demos/j2d/CustomText.java
+++ b/src/demos/j2d/CustomText.java
@@ -74,7 +74,7 @@ import javax.media.opengl.GL2;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
-import javax.media.opengl.util.Animator;
+import com.sun.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 d076007..2bc77dd 100755
--- a/src/demos/j2d/FlyingText.java
+++ b/src/demos/j2d/FlyingText.java
@@ -70,7 +70,7 @@ import javax.media.opengl.GL2;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
-import javax.media.opengl.util.Animator;
+import com.sun.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 eaf4088..6c85610 100755
--- a/src/demos/j2d/TestOverlay.java
+++ b/src/demos/j2d/TestOverlay.java
@@ -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 javax.media.opengl.util.Animator;
+import com.sun.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 813fec0..915dfd2 100755
--- a/src/demos/j2d/TestTextRenderer.java
+++ b/src/demos/j2d/TestTextRenderer.java
@@ -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 javax.media.opengl.util.Animator;
+import com.sun.opengl.util.Animator;
 
 
 
diff --git a/src/demos/j2d/TestTextureRenderer.java b/src/demos/j2d/TestTextureRenderer.java
index 438fbc1..bedcd8c 100755
--- a/src/demos/j2d/TestTextureRenderer.java
+++ b/src/demos/j2d/TestTextureRenderer.java
@@ -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 javax.media.opengl.util.Animator;
+import com.sun.opengl.util.Animator;
 
 
 
diff --git a/src/demos/j2d/TextCube.java b/src/demos/j2d/TextCube.java
index 6ece457..3ed8efd 100755
--- a/src/demos/j2d/TextCube.java
+++ b/src/demos/j2d/TextCube.java
@@ -56,7 +56,7 @@ import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
-import javax.media.opengl.util.Animator;
+import com.sun.opengl.util.Animator;
 
 
 
diff --git a/src/demos/j2d/TextFlow.java b/src/demos/j2d/TextFlow.java
index 72a88ff..478f0bb 100755
--- a/src/demos/j2d/TextFlow.java
+++ b/src/demos/j2d/TextFlow.java
@@ -61,7 +61,7 @@ import javax.media.opengl.GL;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLCanvas;
-import javax.media.opengl.util.Animator;
+import com.sun.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 42feab9..66c036d 100644
--- a/src/demos/jgears/JGears.java
+++ b/src/demos/jgears/JGears.java
@@ -20,7 +20,7 @@ import java.text.DecimalFormat;
 import javax.imageio.ImageIO;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.util.Animator;
+import com.sun.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 5a69a77..d625b43 100755
--- a/src/demos/jrefract/JRefract.java
+++ b/src/demos/jrefract/JRefract.java
@@ -58,8 +58,8 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.util.Animator;
-import javax.media.opengl.util.FPSAnimator;
+import com.sun.opengl.util.Animator;
+import com.sun.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 940079c..edeb28b 100755
--- a/src/demos/misc/GLCapsTableDemo.java
+++ b/src/demos/misc/GLCapsTableDemo.java
@@ -17,7 +17,7 @@ import javax.media.opengl.DefaultGLCapabilitiesChooser;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLCapabilitiesChooser;
 import javax.media.opengl.awt.GLCanvas;
-import javax.media.opengl.util.FPSAnimator;
+import com.sun.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 c985894..7415524 100755
--- a/src/demos/misc/Picking.java
+++ b/src/demos/misc/Picking.java
@@ -17,7 +17,7 @@ import java.nio.*;
 import javax.media.opengl.*;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.*;
-import javax.media.opengl.util.Animator;
+import com.sun.opengl.util.Animator;
 import javax.media.opengl.util.BufferUtil;
 
 public class Picking
diff --git a/src/demos/particles/engine/GLComponent.java b/src/demos/particles/engine/GLComponent.java
index ddde39e..cc54da0 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 javax.media.opengl.util.FPSAnimator;
+import com.sun.opengl.util.FPSAnimator;
 
 public class GLComponent extends GLCanvas implements GLEventListener {
     
diff --git a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
index b0bdfb7..9511bbc 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 javax.media.opengl.util.Animator;
+import com.sun.opengl.util.Animator;
 import javax.swing.JOptionPane;
 
 /**
diff --git a/src/demos/testContextDestruction/TestContextDestruction.java b/src/demos/testContextDestruction/TestContextDestruction.java
index a2344bc..de15e4b 100755
--- a/src/demos/testContextDestruction/TestContextDestruction.java
+++ b/src/demos/testContextDestruction/TestContextDestruction.java
@@ -56,7 +56,7 @@ import javax.media.opengl.GL2;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.awt.GLCanvas;
-import javax.media.opengl.util.Animator;
+import com.sun.opengl.util.Animator;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 
diff --git a/src/demos/vertexBufferObject/VertexBufferObject.java b/src/demos/vertexBufferObject/VertexBufferObject.java
index 2cf9fa4..3825752 100644
--- a/src/demos/vertexBufferObject/VertexBufferObject.java
+++ b/src/demos/vertexBufferObject/VertexBufferObject.java
@@ -53,7 +53,7 @@ import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.AWTGLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
-import javax.media.opengl.util.Animator;
+import com.sun.opengl.util.Animator;
 import javax.media.opengl.util.BufferUtil;
 import javax.swing.JOptionPane;
 
diff --git a/src/demos/vertexProgRefract/VertexProgRefract.java b/src/demos/vertexProgRefract/VertexProgRefract.java
index 75078c6..757534f 100644
--- a/src/demos/vertexProgRefract/VertexProgRefract.java
+++ b/src/demos/vertexProgRefract/VertexProgRefract.java
@@ -58,7 +58,7 @@ import java.io.IOException;
 import javax.media.opengl.*;
 import javax.media.opengl.awt.*;
 import javax.media.opengl.glu.GLU;
-import javax.media.opengl.util.Animator;
+import com.sun.opengl.util.Animator;
 import javax.media.opengl.util.BufferUtil;
 import javax.swing.JOptionPane;
 
diff --git a/src/demos/vertexProgWarp/VertexProgWarp.java b/src/demos/vertexProgWarp/VertexProgWarp.java
index fca8bcf..7bbb4b3 100644
--- a/src/demos/vertexProgWarp/VertexProgWarp.java
+++ b/src/demos/vertexProgWarp/VertexProgWarp.java
@@ -59,7 +59,7 @@ 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 javax.media.opengl.util.Animator;
+import com.sun.opengl.util.Animator;
 import javax.media.opengl.util.BufferUtil;
 import javax.swing.JOptionPane;