Moved GLUT into com.sun.opengl.util.gl2 package and renamed to JOGL

1.0 naming convention. Moved associated font classes into same package
and made them package-private again to reduce the number of classes in
the public API. Updated demos.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1833 232f8b59-042b-4e1e-8c03-345bb8c30851

16 files changed, 32 insertions, 53 deletions

diff --git a/src/classes/com/sun/opengl/util/glut/rec/BitmapCharRec.java b/src/classes/com/sun/opengl/util/gl2/BitmapCharRec.java
index c040f418f..9738be60a 100644
--- a/src/classes/com/sun/opengl/util/glut/rec/BitmapCharRec.java
+++ b/src/classes/com/sun/opengl/util/gl2/BitmapCharRec.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.rec;
+package com.sun.opengl.util.gl2;
 
 /* Copyright (c) Mark J. Kilgard, 1994, 1998. */
 
@@ -45,7 +45,7 @@ package com.sun.opengl.util.glut.rec;
    and is provided without guarantee or warrantee expressed or 
    implied. This program is -not- in the public domain. */
 
-public class BitmapCharRec {
+class BitmapCharRec {
   public int width;
   public int height;
   public float xorig;
diff --git a/src/classes/com/sun/opengl/util/glut/rec/BitmapFontRec.java b/src/classes/com/sun/opengl/util/gl2/BitmapFontRec.java
index 031ef0625..d110c262b 100644
--- a/src/classes/com/sun/opengl/util/glut/rec/BitmapFontRec.java
+++ b/src/classes/com/sun/opengl/util/gl2/BitmapFontRec.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.rec;
+package com.sun.opengl.util.gl2;
 
 /* Copyright (c) Mark J. Kilgard, 1994, 1998. */
 
@@ -45,7 +45,7 @@ package com.sun.opengl.util.glut.rec;
    and is provided without guarantee or warrantee expressed or 
    implied. This program is -not- in the public domain. */
 
-public class BitmapFontRec {
+class BitmapFontRec {
   public String name;
   public int num_chars;
   public int first;
diff --git a/src/classes/com/sun/opengl/util/glut/rec/CoordRec.java b/src/classes/com/sun/opengl/util/gl2/CoordRec.java
index fdc50c5bc..e87354dbf 100644
--- a/src/classes/com/sun/opengl/util/glut/rec/CoordRec.java
+++ b/src/classes/com/sun/opengl/util/gl2/CoordRec.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.rec;
+package com.sun.opengl.util.gl2;
 
 /* Copyright (c) Mark J. Kilgard, 1994, 1998. */
 
@@ -45,7 +45,7 @@ package com.sun.opengl.util.glut.rec;
    and is provided without guarantee or warrantee expressed or 
    implied. This program is -not- in the public domain. */
 
-public class CoordRec {
+class CoordRec {
   public float x;
   public float y;
 
diff --git a/src/classes/com/sun/opengl/util/glut/gl2/GLUTgl2.java b/src/classes/com/sun/opengl/util/gl2/GLUT.java
index 7b23c27db..5a1f7d12d 100644
--- a/src/classes/com/sun/opengl/util/glut/gl2/GLUTgl2.java
+++ b/src/classes/com/sun/opengl/util/gl2/GLUT.java
@@ -37,14 +37,11 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.gl2;
+package com.sun.opengl.util.gl2;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.opengl.glu.gl2.*;
-import com.sun.opengl.util.glut.*;
-import com.sun.opengl.util.glut.rec.*;
-import com.sun.opengl.util.glut.fonts.*;
 
 /** Subset of the routines provided by the GLUT interface. Note the
     signatures of many of the methods are necessarily different than
@@ -95,7 +92,7 @@ import com.sun.opengl.util.glut.fonts.*;
     OpenGL(TM) is a trademark of Silicon Graphics, Inc. <P>
 */
 
-public class GLUTgl2 {
+public class GLUT {
   public static final int STROKE_ROMAN = 0;
   public static final int STROKE_MONO_ROMAN = 1;
   public static final int BITMAP_9_BY_15 = 2;
diff --git a/src/classes/com/sun/opengl/util/glut/fonts/GLUTBitmap8x13.java b/src/classes/com/sun/opengl/util/gl2/GLUTBitmap8x13.java
index 166e8e6b0..b6e5c425a 100644
--- a/src/classes/com/sun/opengl/util/glut/fonts/GLUTBitmap8x13.java
+++ b/src/classes/com/sun/opengl/util/gl2/GLUTBitmap8x13.java
@@ -37,11 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.fonts;
+package com.sun.opengl.util.gl2;
 
-import com.sun.opengl.util.glut.rec.*;
-
-public class GLUTBitmap8x13 {
+class GLUTBitmap8x13 {
 
 /* GENERATED FILE -- DO NOT MODIFY */
 
diff --git a/src/classes/com/sun/opengl/util/glut/fonts/GLUTBitmap9x15.java b/src/classes/com/sun/opengl/util/gl2/GLUTBitmap9x15.java
index e883d0bfb..bba9a8fc5 100644
--- a/src/classes/com/sun/opengl/util/glut/fonts/GLUTBitmap9x15.java
+++ b/src/classes/com/sun/opengl/util/gl2/GLUTBitmap9x15.java
@@ -37,11 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.fonts;
+package com.sun.opengl.util.gl2;
 
-import com.sun.opengl.util.glut.rec.*;
-
-public class GLUTBitmap9x15 {
+class GLUTBitmap9x15 {
 
 /* GENERATED FILE -- DO NOT MODIFY */
 
diff --git a/src/classes/com/sun/opengl/util/glut/fonts/GLUTBitmapHelvetica10.java b/src/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica10.java
index fa383ae94..cca045ffa 100644
--- a/src/classes/com/sun/opengl/util/glut/fonts/GLUTBitmapHelvetica10.java
+++ b/src/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica10.java
@@ -37,11 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.fonts;
+package com.sun.opengl.util.gl2;
 
-import com.sun.opengl.util.glut.rec.*;
-
-public class GLUTBitmapHelvetica10 {
+class GLUTBitmapHelvetica10 {
 
 /* GENERATED FILE -- DO NOT MODIFY */
 
diff --git a/src/classes/com/sun/opengl/util/glut/fonts/GLUTBitmapHelvetica12.java b/src/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica12.java
index 9677d7307..b73c82fa9 100644
--- a/src/classes/com/sun/opengl/util/glut/fonts/GLUTBitmapHelvetica12.java
+++ b/src/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica12.java
@@ -37,11 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.fonts;
+package com.sun.opengl.util.gl2;
 
-import com.sun.opengl.util.glut.rec.*;
-
-public class GLUTBitmapHelvetica12 {
+class GLUTBitmapHelvetica12 {
 
 /* GENERATED FILE -- DO NOT MODIFY */
 
diff --git a/src/classes/com/sun/opengl/util/glut/fonts/GLUTBitmapHelvetica18.java b/src/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica18.java
index ebdd941f1..cf34a6d25 100644
--- a/src/classes/com/sun/opengl/util/glut/fonts/GLUTBitmapHelvetica18.java
+++ b/src/classes/com/sun/opengl/util/gl2/GLUTBitmapHelvetica18.java
@@ -37,11 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.fonts;
+package com.sun.opengl.util.gl2;
 
-import com.sun.opengl.util.glut.rec.*;
-
-public class GLUTBitmapHelvetica18 {
+class GLUTBitmapHelvetica18 {
 
 /* GENERATED FILE -- DO NOT MODIFY */
 
diff --git a/src/classes/com/sun/opengl/util/glut/fonts/GLUTBitmapTimesRoman10.java b/src/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman10.java
index c220e6eb2..32699863f 100644
--- a/src/classes/com/sun/opengl/util/glut/fonts/GLUTBitmapTimesRoman10.java
+++ b/src/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman10.java
@@ -37,11 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.fonts;
+package com.sun.opengl.util.gl2;
 
-import com.sun.opengl.util.glut.rec.*;
-
-public class GLUTBitmapTimesRoman10 {
+class GLUTBitmapTimesRoman10 {
 
 /* GENERATED FILE -- DO NOT MODIFY */
 
diff --git a/src/classes/com/sun/opengl/util/glut/fonts/GLUTBitmapTimesRoman24.java b/src/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman24.java
index 58fbc5d72..36fb76c66 100644
--- a/src/classes/com/sun/opengl/util/glut/fonts/GLUTBitmapTimesRoman24.java
+++ b/src/classes/com/sun/opengl/util/gl2/GLUTBitmapTimesRoman24.java
@@ -37,11 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.fonts;
+package com.sun.opengl.util.gl2;
 
-import com.sun.opengl.util.glut.rec.*;
-
-public class GLUTBitmapTimesRoman24 {
+class GLUTBitmapTimesRoman24 {
 
 /* GENERATED FILE -- DO NOT MODIFY */
 
diff --git a/src/classes/com/sun/opengl/util/glut/fonts/GLUTStrokeMonoRoman.java b/src/classes/com/sun/opengl/util/gl2/GLUTStrokeMonoRoman.java
index 9abe353cf..79e4b70f8 100644
--- a/src/classes/com/sun/opengl/util/glut/fonts/GLUTStrokeMonoRoman.java
+++ b/src/classes/com/sun/opengl/util/gl2/GLUTStrokeMonoRoman.java
@@ -37,11 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.fonts;
+package com.sun.opengl.util.gl2;
 
-import com.sun.opengl.util.glut.rec.*;
-
-public class GLUTStrokeMonoRoman {
+class GLUTStrokeMonoRoman {
 
 /* GENERATED FILE -- DO NOT MODIFY */
 
diff --git a/src/classes/com/sun/opengl/util/glut/fonts/GLUTStrokeRoman.java b/src/classes/com/sun/opengl/util/gl2/GLUTStrokeRoman.java
index 83049d99b..e960f155a 100644
--- a/src/classes/com/sun/opengl/util/glut/fonts/GLUTStrokeRoman.java
+++ b/src/classes/com/sun/opengl/util/gl2/GLUTStrokeRoman.java
@@ -37,11 +37,9 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.fonts;
+package com.sun.opengl.util.gl2;
 
-import com.sun.opengl.util.glut.rec.*;
-
-public class GLUTStrokeRoman {
+class GLUTStrokeRoman {
 
 /* GENERATED FILE -- DO NOT MODIFY */
 
diff --git a/src/classes/com/sun/opengl/util/glut/rec/StrokeCharRec.java b/src/classes/com/sun/opengl/util/gl2/StrokeCharRec.java
index 96870fe96..1d5d3de63 100644
--- a/src/classes/com/sun/opengl/util/glut/rec/StrokeCharRec.java
+++ b/src/classes/com/sun/opengl/util/gl2/StrokeCharRec.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.rec;
+package com.sun.opengl.util.gl2;
 
 /* Copyright (c) Mark J. Kilgard, 1994, 1998. */
 
@@ -45,7 +45,7 @@ package com.sun.opengl.util.glut.rec;
    and is provided without guarantee or warrantee expressed or 
    implied. This program is -not- in the public domain. */
 
-public class StrokeCharRec {
+class StrokeCharRec {
   public int num_strokes;
   public StrokeRec[] stroke;
   public float center;
diff --git a/src/classes/com/sun/opengl/util/glut/rec/StrokeFontRec.java b/src/classes/com/sun/opengl/util/gl2/StrokeFontRec.java
index 4313c5873..0e6133a2d 100644
--- a/src/classes/com/sun/opengl/util/glut/rec/StrokeFontRec.java
+++ b/src/classes/com/sun/opengl/util/gl2/StrokeFontRec.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.rec;
+package com.sun.opengl.util.gl2;
 
 /* Copyright (c) Mark J. Kilgard, 1994, 1998. */
 
@@ -45,7 +45,7 @@ package com.sun.opengl.util.glut.rec;
    and is provided without guarantee or warrantee expressed or 
    implied. This program is -not- in the public domain. */
 
-public class StrokeFontRec {
+class StrokeFontRec {
   public String name;
   public int num_chars;
   public StrokeCharRec[] ch;
diff --git a/src/classes/com/sun/opengl/util/glut/rec/StrokeRec.java b/src/classes/com/sun/opengl/util/gl2/StrokeRec.java
index 82ddbab0b..91241ebc0 100644
--- a/src/classes/com/sun/opengl/util/glut/rec/StrokeRec.java
+++ b/src/classes/com/sun/opengl/util/gl2/StrokeRec.java
@@ -37,7 +37,7 @@
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
-package com.sun.opengl.util.glut.rec;
+package com.sun.opengl.util.gl2;
 
 /* Copyright (c) Mark J. Kilgard, 1994, 1998. */
 
@@ -45,7 +45,7 @@ package com.sun.opengl.util.glut.rec;
    and is provided without guarantee or warrantee expressed or 
    implied. This program is -not- in the public domain. */
 
-public class StrokeRec {
+class StrokeRec {
   public int num_coords;
   public CoordRec[] coord;