Moved GLU-related classes into javax.media.opengl.glu package. Still

need to break dependence from GLContext / GLAutoDrawable classes'
getGLU() method down into this new package; should make GLU a class
rather than an interface and probably make it instantiatable with a
target GL object in the constructor. Should also make GLU and GLUT
interfaces look similar (i.e., probably accept GL and GLU objects in
constructor of GLUT rather than taking them as arguments on each
method call). Ignored GLUnurbs data type from glue code generation.
Updated demos for new location of GLU. Fixed broken package of Version
class. Minor javadoc cleanups.


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

19 files changed, 20 insertions, 5 deletions

diff --git a/src/demos/cg/runtime_ogl/cgGL_vertex_example.java b/src/demos/cg/runtime_ogl/cgGL_vertex_example.java
index acb4f0d..0856aed 100644
--- a/src/demos/cg/runtime_ogl/cgGL_vertex_example.java
+++ b/src/demos/cg/runtime_ogl/cgGL_vertex_example.java
@@ -35,6 +35,7 @@ package demos.cg.runtime_ogl;
 
 import com.sun.opengl.cg.*;
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 
 import java.awt.*;
diff --git a/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java b/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java
index ff168a5..05ee830 100644
--- a/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java
+++ b/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java
@@ -35,6 +35,7 @@ package demos.cg.runtime_ogl_vertex_fragment;
 
 import com.sun.opengl.cg.*;
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import com.sun.opengl.utils.*;
 
diff --git a/src/demos/context/DualContext.java b/src/demos/context/DualContext.java
index 927b60c..b07d040 100755
--- a/src/demos/context/DualContext.java
+++ b/src/demos/context/DualContext.java
@@ -44,7 +44,7 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import javax.media.opengl.*;
-import com.sun.opengl.utils.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 
 /** This demo illustrates the use of the GLDrawable and GLContext APIs
diff --git a/src/demos/hdr/HDR.java b/src/demos/hdr/HDR.java
index 8173d97..758472c 100755
--- a/src/demos/hdr/HDR.java
+++ b/src/demos/hdr/HDR.java
@@ -8,7 +8,7 @@ import java.util.*;
 import javax.swing.*;
 
 import javax.media.opengl.*;
-import com.sun.opengl.utils.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import demos.common.*;
 import demos.util.*;
diff --git a/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java b/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
index 23029bd..a6415fa 100644
--- a/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
+++ b/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
@@ -43,7 +43,7 @@ import javax.imageio.*;
 import javax.swing.*;
 
 import javax.media.opengl.*;
-import com.sun.opengl.utils.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import demos.common.*;
 import demos.util.*;
diff --git a/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java b/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java
index 75d5cf6..fe1b9d5 100644
--- a/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java
+++ b/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java
@@ -43,7 +43,7 @@ import javax.imageio.*;
 import javax.imageio.stream.*;
 
 import javax.media.opengl.*;
-import com.sun.opengl.utils.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import demos.common.*;
 import demos.util.*;
diff --git a/src/demos/multisample/Multisample.java b/src/demos/multisample/Multisample.java
index 693e1a7..ba8f67d 100755
--- a/src/demos/multisample/Multisample.java
+++ b/src/demos/multisample/Multisample.java
@@ -42,6 +42,7 @@ package demos.multisample;
 import java.awt.*;
 import java.awt.event.*;
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 
 public class Multisample {
diff --git a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
index 24ce3cc..2076368 100644
--- a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
+++ b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
@@ -38,6 +38,7 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import demos.common.*;
 import demos.util.*;
diff --git a/src/demos/proceduralTexturePhysics/Water.java b/src/demos/proceduralTexturePhysics/Water.java
index 16b520f..d0585fc 100644
--- a/src/demos/proceduralTexturePhysics/Water.java
+++ b/src/demos/proceduralTexturePhysics/Water.java
@@ -42,6 +42,7 @@ import java.util.*;
 
 import gleem.linalg.*;
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import demos.util.*;
 
diff --git a/src/demos/tess/Tess.java b/src/demos/tess/Tess.java
index de57cf5..8706c0d 100644
--- a/src/demos/tess/Tess.java
+++ b/src/demos/tess/Tess.java
@@ -59,6 +59,7 @@ package demos.tess;
  */
 
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 
 import java.awt.*;
@@ -194,7 +195,7 @@ public class Tess {
     }//end TessRenderer
 
 
-    public static class TessCallback extends javax.media.opengl.GLUtessellatorCallbackAdapter {
+    public static class TessCallback extends javax.media.opengl.glu.GLUtessellatorCallbackAdapter {
         GL gl;
         GLU glu;
 
diff --git a/src/demos/vertexArrayRange/VertexArrayRange.java b/src/demos/vertexArrayRange/VertexArrayRange.java
index 7c4d1a5..e355cdc 100644
--- a/src/demos/vertexArrayRange/VertexArrayRange.java
+++ b/src/demos/vertexArrayRange/VertexArrayRange.java
@@ -40,6 +40,7 @@ import java.util.*;
 import javax.swing.*;
 
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import com.sun.opengl.utils.*;
 import demos.common.*;
diff --git a/src/demos/vertexBufferObject/VertexBufferObject.java b/src/demos/vertexBufferObject/VertexBufferObject.java
index 97a5483..f8f9a8d 100644
--- a/src/demos/vertexBufferObject/VertexBufferObject.java
+++ b/src/demos/vertexBufferObject/VertexBufferObject.java
@@ -40,6 +40,7 @@ import java.util.*;
 import javax.swing.*;
 
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import com.sun.opengl.utils.*;
 import demos.common.*;
diff --git a/src/demos/vertexProgRefract/VertexProgRefract.java b/src/demos/vertexProgRefract/VertexProgRefract.java
index e3b4ab5..f8e70f2 100644
--- a/src/demos/vertexProgRefract/VertexProgRefract.java
+++ b/src/demos/vertexProgRefract/VertexProgRefract.java
@@ -44,6 +44,7 @@ import javax.imageio.stream.*;
 import javax.swing.*;
 
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import com.sun.opengl.utils.*;
 import demos.common.*;
diff --git a/src/demos/vertexProgWarp/VertexProgWarp.java b/src/demos/vertexProgWarp/VertexProgWarp.java
index cba8b23..d8ac581 100644
--- a/src/demos/vertexProgWarp/VertexProgWarp.java
+++ b/src/demos/vertexProgWarp/VertexProgWarp.java
@@ -41,6 +41,7 @@ import java.util.*;
 import javax.swing.*;
 
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import demos.common.*;
 import demos.util.*;
diff --git a/src/gleem/TestExaminerViewer.java b/src/gleem/TestExaminerViewer.java
index 0c748da..40e5607 100644
--- a/src/gleem/TestExaminerViewer.java
+++ b/src/gleem/TestExaminerViewer.java
@@ -42,6 +42,7 @@ package gleem;
 import java.awt.*;
 import java.awt.event.*;
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import gleem.linalg.*;
 
diff --git a/src/gleem/TestHandleBox.java b/src/gleem/TestHandleBox.java
index 1bb4b8b..c6eb7a4 100644
--- a/src/gleem/TestHandleBox.java
+++ b/src/gleem/TestHandleBox.java
@@ -42,6 +42,7 @@ package gleem;
 import java.awt.*;
 import java.awt.event.*;
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import gleem.linalg.*;
 
diff --git a/src/gleem/TestMultiWin.java b/src/gleem/TestMultiWin.java
index d61d0c2..e636bef 100644
--- a/src/gleem/TestMultiWin.java
+++ b/src/gleem/TestMultiWin.java
@@ -42,6 +42,7 @@ package gleem;
 import java.awt.*;
 import java.awt.event.*;
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import gleem.linalg.*;
 
diff --git a/src/gleem/TestTranslate1.java b/src/gleem/TestTranslate1.java
index 679a672..6fef762 100644
--- a/src/gleem/TestTranslate1.java
+++ b/src/gleem/TestTranslate1.java
@@ -42,6 +42,7 @@ package gleem;
 import java.awt.*;
 import java.awt.event.*;
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import gleem.linalg.*;
 
diff --git a/src/gleem/TestTranslate2.java b/src/gleem/TestTranslate2.java
index ca17d1c..d222ff3 100644
--- a/src/gleem/TestTranslate2.java
+++ b/src/gleem/TestTranslate2.java
@@ -42,6 +42,7 @@ package gleem;
 import java.awt.*;
 import java.awt.event.*;
 import javax.media.opengl.*;
+import javax.media.opengl.glu.*;
 import com.sun.opengl.utils.*;
 import gleem.linalg.*;