Renamed all files to intended destination packages for JSR-231. The

only package specified by the JSR is "javax.media.opengl". The utility
package com.sun.opengl.utils is Sun-specific and optional. The Cg
binding has been moved into com.sun.opengl.cg. Moved Animator and
FPSAnimator to com.sun.opengl.utils. Updated and tested demos with new
source code locations.


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

16 files changed, 32 insertions, 16 deletions

diff --git a/src/gleem/ExaminerViewer.java b/src/gleem/ExaminerViewer.java
index 44e3f06..61976b1 100644
--- a/src/gleem/ExaminerViewer.java
+++ b/src/gleem/ExaminerViewer.java
@@ -44,7 +44,8 @@ import java.awt.event.*;
 import java.util.*;
 
 import gleem.linalg.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 
 /** <P> This is an application-level class, not part of the
     manipulator hierarchy. It is an example of how you might integrate
diff --git a/src/gleem/HandleBoxManip.java b/src/gleem/HandleBoxManip.java
index bedde65..73256c0 100644
--- a/src/gleem/HandleBoxManip.java
+++ b/src/gleem/HandleBoxManip.java
@@ -42,7 +42,8 @@ package gleem;
 import java.util.*;
 
 import gleem.linalg.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 
 /** Patterned after Inventor's HandleBoxManip (by Paul Isaacs and
     David Mott) and TransformerManip (by Paul Isaacs). Center box
diff --git a/src/gleem/Manip.java b/src/gleem/Manip.java
index b037430..919b805 100644
--- a/src/gleem/Manip.java
+++ b/src/gleem/Manip.java
@@ -42,7 +42,8 @@ package gleem;
 import java.util.*;
 
 import gleem.linalg.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 
 /** The base class for all manipulators. Fundamentally a manipulator
     must support a ray cast operation with itself and logic to
diff --git a/src/gleem/ManipManager.java b/src/gleem/ManipManager.java
index 5e0ae05..767c8cd 100644
--- a/src/gleem/ManipManager.java
+++ b/src/gleem/ManipManager.java
@@ -44,7 +44,8 @@ import java.util.*;
 
 import gleem.linalg.*;
 
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 
 /** The ManipManager handles making manipulators visible in a
     window. */
diff --git a/src/gleem/ManipPart.java b/src/gleem/ManipPart.java
index 50fbe61..83f21cf 100644
--- a/src/gleem/ManipPart.java
+++ b/src/gleem/ManipPart.java
@@ -42,7 +42,8 @@ package gleem;
 import java.util.*;
 
 import gleem.linalg.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 
 /** A ManipPart is a visible or invisible sub-part of a manipulator.
     ManipParts are organized into trees. */
diff --git a/src/gleem/ManipPartGroup.java b/src/gleem/ManipPartGroup.java
index 859a8a3..97a31ec 100644
--- a/src/gleem/ManipPartGroup.java
+++ b/src/gleem/ManipPartGroup.java
@@ -42,7 +42,8 @@ package gleem;
 import java.util.*;
 
 import gleem.linalg.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 
 /** This class groups a set of ManipParts. Makes a set of ManipParts
     look like one. */
diff --git a/src/gleem/ManipPartLineSeg.java b/src/gleem/ManipPartLineSeg.java
index 8278533..ea34b5c 100644
--- a/src/gleem/ManipPartLineSeg.java
+++ b/src/gleem/ManipPartLineSeg.java
@@ -42,7 +42,8 @@ package gleem;
 import java.util.*;
 
 import gleem.linalg.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 
 /** A line segment from (-1, 0, 0) to (1, 0, 0). */
 
diff --git a/src/gleem/ManipPartTriBased.java b/src/gleem/ManipPartTriBased.java
index 97f8ae3..208c8ea 100644
--- a/src/gleem/ManipPartTriBased.java
+++ b/src/gleem/ManipPartTriBased.java
@@ -42,7 +42,8 @@ package gleem;
 import java.util.*;
 
 import gleem.linalg.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 
 /** Triangle-based manipulator part. This is the base class for most
     of the ManipParts that GLEEM uses internally. You can feel free to
diff --git a/src/gleem/TestExaminerViewer.java b/src/gleem/TestExaminerViewer.java
index d793846..0c748da 100644
--- a/src/gleem/TestExaminerViewer.java
+++ b/src/gleem/TestExaminerViewer.java
@@ -41,7 +41,8 @@ package gleem;
 
 import java.awt.*;
 import java.awt.event.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 import gleem.linalg.*;
 
 /** Tests the Examiner Viewer. */
diff --git a/src/gleem/TestHandleBox.java b/src/gleem/TestHandleBox.java
index e47c1ab..1bb4b8b 100644
--- a/src/gleem/TestHandleBox.java
+++ b/src/gleem/TestHandleBox.java
@@ -41,7 +41,8 @@ package gleem;
 
 import java.awt.*;
 import java.awt.event.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 import gleem.linalg.*;
 
 /** Tests the HandleBox Manip. */
diff --git a/src/gleem/TestMultiWin.java b/src/gleem/TestMultiWin.java
index 7a9fe14..d61d0c2 100644
--- a/src/gleem/TestMultiWin.java
+++ b/src/gleem/TestMultiWin.java
@@ -41,7 +41,8 @@ package gleem;
 
 import java.awt.*;
 import java.awt.event.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 import gleem.linalg.*;
 
 /** Tests viewing manipulators in multiple winodws. */
diff --git a/src/gleem/TestTranslate1.java b/src/gleem/TestTranslate1.java
index 086e3a7..679a672 100644
--- a/src/gleem/TestTranslate1.java
+++ b/src/gleem/TestTranslate1.java
@@ -41,7 +41,8 @@ package gleem;
 
 import java.awt.*;
 import java.awt.event.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 import gleem.linalg.*;
 
 /** Tests the Translate1 Manip. */
diff --git a/src/gleem/TestTranslate2.java b/src/gleem/TestTranslate2.java
index 70a0041..ca17d1c 100644
--- a/src/gleem/TestTranslate2.java
+++ b/src/gleem/TestTranslate2.java
@@ -41,7 +41,8 @@ package gleem;
 
 import java.awt.*;
 import java.awt.event.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 import gleem.linalg.*;
 
 /** Tests the Translate2 Manip. */
diff --git a/src/gleem/Translate1Manip.java b/src/gleem/Translate1Manip.java
index 541173f..49c4087 100644
--- a/src/gleem/Translate1Manip.java
+++ b/src/gleem/Translate1Manip.java
@@ -42,7 +42,8 @@ package gleem;
 import java.util.*;
 
 import gleem.linalg.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 
 /** A Translate1Manip is a Manip which translates in only one
     dimension and whose default representation is a two-way arrow. */
diff --git a/src/gleem/Translate2Manip.java b/src/gleem/Translate2Manip.java
index a76df48..101b1e4 100644
--- a/src/gleem/Translate2Manip.java
+++ b/src/gleem/Translate2Manip.java
@@ -42,7 +42,8 @@ package gleem;
 import java.util.*;
 
 import gleem.linalg.*;
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 
 /** A Translate2Manip is a Manip which translates in two dimensions and
     whose default representation is two arrows. */
diff --git a/src/gleem/WindowUpdateListener.java b/src/gleem/WindowUpdateListener.java
index c87107a..793f051 100644
--- a/src/gleem/WindowUpdateListener.java
+++ b/src/gleem/WindowUpdateListener.java
@@ -39,7 +39,8 @@
 
 package gleem;
 
-import net.java.games.jogl.*;
+import javax.media.opengl.*;
+import com.sun.opengl.utils.*;
 
 /** A WindowUpdateListener is used by the ManipManager to transmit
     repaint() notifications to windows containing Manips. When a Manip