Moved J2DTextureRenderer and J2DOverlay into their own sub-package and

dropped the prefixes on the suggestion of Chris Campbell. No other
changes to these classes. Added com.sun.opengl.util.j2d to the javadoc
generation. Updated demos.


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

2 files changed, 13 insertions, 13 deletions

diff --git a/src/demos/j2d/TestJ2DOverlay.java b/src/demos/j2d/TestOverlay.java
index a3104ac..5faa0d5 100755
--- a/src/demos/j2d/TestJ2DOverlay.java
+++ b/src/demos/j2d/TestOverlay.java
@@ -51,23 +51,23 @@ import java.text.*;
 
 import javax.media.opengl.*;
 import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.*;
+import com.sun.opengl.util.j2d.*;
 
 import demos.gears.Gears;
 import demos.util.*;
 import gleem.linalg.*;
 
-/** A simple test of the J2DOverlay class. Draws gears underneath with
-    moving Java 2D-rendered text on top. */
+/** A simple test of the Overlay utility class. Draws gears underneath
+    with moving Java 2D-rendered text on top. */
 
-public class TestJ2DOverlay implements GLEventListener {
+public class TestOverlay implements GLEventListener {
   public static void main(String[] args) {
     Frame frame = new Frame("Java 2D Overlay Test");
     GLCapabilities caps = new GLCapabilities();
     caps.setAlphaBits(8);
     GLCanvas canvas = new GLCanvas(caps);
     canvas.addGLEventListener(new Gears());
-    canvas.addGLEventListener(new TestJ2DOverlay());
+    canvas.addGLEventListener(new TestOverlay());
     frame.add(canvas);
     frame.setSize(512, 512);
     final Animator animator = new Animator(canvas);
@@ -88,7 +88,7 @@ public class TestJ2DOverlay implements GLEventListener {
     animator.start();
   }
 
-  private J2DOverlay overlay;
+  private Overlay overlay;
   private Time time;
   private Font font;
   private Color TRANSPARENT_BLACK = new Color(0.0f, 0.0f, 0.0f, 0.0f);
@@ -107,7 +107,7 @@ public class TestJ2DOverlay implements GLEventListener {
     GL gl = drawable.getGL();
     gl.setSwapInterval(0);
 
-    overlay = new J2DOverlay(drawable);
+    overlay = new Overlay(drawable);
     time = new SystemTime();
     ((SystemTime) time).rebase();
 
diff --git a/src/demos/j2d/TestJ2DRenderer.java b/src/demos/j2d/TestTextureRenderer.java
index f7ea8c3..09f3fd8 100755
--- a/src/demos/j2d/TestJ2DRenderer.java
+++ b/src/demos/j2d/TestTextureRenderer.java
@@ -52,23 +52,23 @@ import java.text.*;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.*;
+import com.sun.opengl.util.j2d.*;
 
 import demos.gears.Gears;
 import demos.util.*;
 import gleem.linalg.*;
 
-/** A simple test of the J2DTextureRenderer class. Draws gears
+/** A simple test of the TextureRenderer utility class. Draws gears
     underneath with moving Java 2D-rendered text on top. */
 
-public class TestJ2DRenderer implements GLEventListener {
+public class TestTextureRenderer implements GLEventListener {
   public static void main(String[] args) {
     Frame frame = new Frame("Java 2D Renderer Test");
     GLCapabilities caps = new GLCapabilities();
     caps.setAlphaBits(8);
     GLCanvas canvas = new GLCanvas(caps);
     canvas.addGLEventListener(new Gears());
-    canvas.addGLEventListener(new TestJ2DRenderer());
+    canvas.addGLEventListener(new TestTextureRenderer());
     frame.add(canvas);
     frame.setSize(512, 512);
     final Animator animator = new Animator(canvas);
@@ -89,7 +89,7 @@ public class TestJ2DRenderer implements GLEventListener {
     animator.start();
   }
 
-  private J2DTextureRenderer renderer;
+  private TextureRenderer renderer;
   private Time time;
   private Font font;
   private Color TRANSPARENT_BLACK = new Color(0.0f, 0.0f, 0.0f, 0.0f);
@@ -107,7 +107,7 @@ public class TestJ2DRenderer implements GLEventListener {
     GL gl = drawable.getGL();
     gl.setSwapInterval(0);
 
-    renderer = new J2DTextureRenderer(256, 256, true);
+    renderer = new TextureRenderer(256, 256, true);
     time = new SystemTime();
     ((SystemTime) time).rebase();