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, 4 insertions, 4 deletions

diff --git a/src/demos/j2d/CustomText.java b/src/demos/j2d/CustomText.java
index 1b47d84..9830468 100755
--- a/src/demos/j2d/CustomText.java
+++ b/src/demos/j2d/CustomText.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;
@@ -138,7 +138,7 @@ public class CustomText extends Demo {
   private List/*<TextInfo>*/ textInfo = new ArrayList/*<TextInfo>*/();
   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;
@@ -206,7 +206,7 @@ public class CustomText extends Demo {
     backgroundTexture.setTexParameteri(GL.GL_TEXTURE_WRAP_T,     GL.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,
                                 new CustomRenderDelegate(52, 10, Color.BLUE, Color.CYAN));
 
     // Create the FPS counter
@@ -382,7 +382,7 @@ public class CustomText extends Demo {
 
   private static final Color DROP_SHADOW_COLOR = new Color(0, 0, 0, 0.5f);
 
-  class CustomRenderDelegate implements GL2TextRenderer.RenderDelegate {
+  class CustomRenderDelegate implements TextRenderer.RenderDelegate {
     private float gradientSize;
     private int dropShadowDepth;
     private Color color1;