Moved GL2- and AWT-specific utility classes into the AWT package

because the expectation is that the AWT implementation will only be
used on the desktop, where the GL2 profile is always available, and
renamed the classes to their JOGL 1.0 naming convention. Updated demos.


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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/demos/j2d/TestTextRenderer.java b/src/demos/j2d/TestTextRenderer.java
index d05d5fb..813fec0 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.gl2.GL2TextRenderer;
+import com.sun.opengl.util.awt.TextRenderer;
 import demos.gears.Gears;
 import demos.util.FPSCounter;
 import demos.util.SystemTime;
@@ -92,7 +92,7 @@ public class TestTextRenderer implements GLEventListener {
     animator.start();
   }
 
-  private GL2TextRenderer renderer;
+  private TextRenderer renderer;
   private Time time;
   private Font font;
   private Vec2f velocity = new Vec2f(100.0f, 150.0f);
@@ -111,7 +111,7 @@ public class TestTextRenderer implements GLEventListener {
     // Gears demo)
     gl.setSwapInterval(0);
 
-    renderer = new GL2TextRenderer(new Font("SansSerif", Font.BOLD, 36));
+    renderer = new TextRenderer(new Font("SansSerif", Font.BOLD, 36));
     time = new SystemTime();
     ((SystemTime) time).rebase();