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/FlyingText.java b/src/demos/j2d/FlyingText.java
index 24ca1da..d076007 100755
--- a/src/demos/j2d/FlyingText.java
+++ b/src/demos/j2d/FlyingText.java
@@ -39,7 +39,7 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.gl2.GL2TextRenderer;
+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;
@@ -153,7 +153,7 @@ public class FlyingText extends Demo {
   private int dropShadowDistance = DEFAULT_DROP_SHADOW_DIST;
   private Time time;
   private Texture backgroundTexture;
-  private GL2TextRenderer renderer;
+  private TextRenderer renderer;
   private Random random = new Random();
   private GLU glu = new GLU();
   private int width;
@@ -247,7 +247,7 @@ public class FlyingText extends Demo {
     backgroundTexture.setTexParameteri(GL2.GL_TEXTURE_WRAP_T,     GL2.GL_REPEAT);
 
     // Create the text renderer
-    renderer = new GL2TextRenderer(new Font("Serif", Font.PLAIN, 72), true, true);
+    renderer = new TextRenderer(new Font("Serif", Font.PLAIN, 72), true, true);
 
     // Create the FPS counter
     fps = new FPSCounter(drawable, 36);