JAWT Support JDK >=1.3

16 files changed, 17 insertions, 16 deletions

diff --git a/demos/RonsDemos/dinoshade.java b/demos/RonsDemos/dinoshade.java
index 344fd00..570ea12 100755
--- a/demos/RonsDemos/dinoshade.java
+++ b/demos/RonsDemos/dinoshade.java
@@ -611,7 +611,7 @@ public class dinoshade extends SimpleGLAnimApplet1
             {

                     /* Draw a yellow ball at the light source. */

                 gl.glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);

-                int qobj = glu.gluNewQuadric();

+                long qobj = glu.gluNewQuadric();

                 glu.gluQuadricOrientation(qobj,GLU_OUTSIDE);

                 glu.gluQuadricNormals(qobj,GLU_SMOOTH);

                 glu.gluQuadricTexture(qobj,false);

diff --git a/demos/RonsDemos/fog.java b/demos/RonsDemos/fog.java
index 7f99c94..3865f62 100644
--- a/demos/RonsDemos/fog.java
+++ b/demos/RonsDemos/fog.java
@@ -215,7 +215,7 @@ public class fog extends Applet
             gl.glPushMatrix();

             gl.glTranslatef(x, y, z);

 

-            int qobj = glu.gluNewQuadric();

+            long qobj = glu.gluNewQuadric();

             glu.gluQuadricOrientation(qobj,GLU_OUTSIDE);

             glu.gluQuadricNormals(qobj,GLU_SMOOTH);

             glu.gluQuadricTexture(qobj,false);

diff --git a/demos/RonsDemos/material.java b/demos/RonsDemos/material.java
index 2558c84..b78a1ec 100644
--- a/demos/RonsDemos/material.java
+++ b/demos/RonsDemos/material.java
@@ -188,7 +188,7 @@ public class material extends Applet
             float low_shininess[] = { 5.0f };

             float high_shininess[] = { 100.0f };

             float mat_emission[] = {0.3f, 0.2f, 0.2f, 0.0f};

-            int qobj;

+            long qobj;

             

             gl.glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

             

diff --git a/demos/RonsDemos/molehill.java b/demos/RonsDemos/molehill.java
index 8dbe12e..42eea66 100644
--- a/demos/RonsDemos/molehill.java
+++ b/demos/RonsDemos/molehill.java
@@ -87,7 +87,7 @@ public class molehill extends Applet
         float pts2[] = new float[4*4*3];

         float pts3[] = new float[4*4*3];

         float pts4[] = new float[4*4*3];

-        int nurb;

+        long nurb;

         int u, v;

         

         public molehillCanvas(int w, int h)

diff --git a/demos/RonsDemos/moth.java b/demos/RonsDemos/moth.java
index c12a4a9..dfc42ac 100644
--- a/demos/RonsDemos/moth.java
+++ b/demos/RonsDemos/moth.java
@@ -423,7 +423,7 @@ public class moth extends SimpleGLAnimApplet1
             gl.glTranslatef(0.0f, 1.6f, -5.0f);

 

                 /* draw lamp */

-            int qobj = glu.gluNewQuadric();

+            long qobj = glu.gluNewQuadric();

             glu.gluQuadricOrientation(qobj,GLU_OUTSIDE);

             glu.gluQuadricNormals(qobj,GLU_SMOOTH);

             glu.gluQuadricTexture(qobj,false);

diff --git a/demos/RonsDemos/particle.java b/demos/RonsDemos/particle.java
index 2369b00..7f1d552 100644
--- a/demos/RonsDemos/particle.java
+++ b/demos/RonsDemos/particle.java
@@ -253,7 +253,7 @@ public class particle extends SimpleGLAnimApplet1
             sphere_list = gl.glGenLists(1);

             gl.glNewList(sphere_list,GL_COMPILE);

             gl.glColor3ub((byte)0, (byte)255, (byte)128);

-            int qobj = glu.gluNewQuadric();

+            long qobj = glu.gluNewQuadric();

             glu.gluQuadricOrientation(qobj,GLU_OUTSIDE);

             glu.gluQuadricNormals(qobj,GLU_SMOOTH);

             glu.gluQuadricTexture(qobj,false);

diff --git a/demos/RonsDemos/polyoff.java b/demos/RonsDemos/polyoff.java
index a79a398..255aa0a 100644
--- a/demos/RonsDemos/polyoff.java
+++ b/demos/RonsDemos/polyoff.java
@@ -147,7 +147,7 @@ public class polyoff extends Applet
             list = gl.glGenLists(1);

             gl.glNewList (list, GL_COMPILE);

 

-            int qobj = glu.gluNewQuadric();

+            long qobj = glu.gluNewQuadric();

             glu.gluQuadricOrientation(qobj,GLU_OUTSIDE);

             glu.gluQuadricNormals(qobj,GLU_SMOOTH);

             glu.gluQuadricTexture(qobj,false);

diff --git a/demos/RonsDemos/quadric.java b/demos/RonsDemos/quadric.java
index 932f428..0c39b13 100644
--- a/demos/RonsDemos/quadric.java
+++ b/demos/RonsDemos/quadric.java
@@ -125,7 +125,7 @@ public class quadric extends Applet
             System.out.println("init(): " + this);

             reshape(getSize().width, getSize().height);

 

-            int qobj;

+            long qobj;

             float mat_ambient[] = { 0.5f, 0.5f, 0.5f, 1.0f };

             float mat_specular[] = { 1.0f, 1.0f, 1.0f, 1.0f };

             float mat_shininess[] = { 50.0f };

diff --git a/demos/RonsDemos/reflect.java b/demos/RonsDemos/reflect.java
index e857881..6858c26 100644
--- a/demos/RonsDemos/reflect.java
+++ b/demos/RonsDemos/reflect.java
@@ -283,7 +283,7 @@ public class reflect extends SimpleGLAnimApplet1
 

         private void make_objects()

         {

-           int q;

+           long q;

         

            float cyan[]  = { 0.0f, 1.0f, 1.0f, 1.0f };

            float green[] = { 0.2f, 1.0f, 0.2f, 1.0f };

diff --git a/demos/RonsDemos/renormal.java b/demos/RonsDemos/renormal.java
index 783bf15..1a0ecdf 100644
--- a/demos/RonsDemos/renormal.java
+++ b/demos/RonsDemos/renormal.java
@@ -93,7 +93,7 @@ public class renormal extends SimpleGLAnimApplet1
             gl.glPushMatrix();

             gl.glScalef(scale, scale, scale);

 

-            int qobj = glu.gluNewQuadric();

+            long qobj = glu.gluNewQuadric();

             glu.gluQuadricOrientation(qobj,GLU_OUTSIDE);

             glu.gluQuadricNormals(qobj,GLU_SMOOTH);

             glu.gluQuadricTexture(qobj,false);

diff --git a/demos/RonsDemos/rings.java b/demos/RonsDemos/rings.java
index 8a08bb5..c03ca7d 100644
--- a/demos/RonsDemos/rings.java
+++ b/demos/RonsDemos/rings.java
@@ -352,7 +352,7 @@ public class rings extends SimpleGLAnimApplet1
              int slices,

              int stacks)

         {

-            int qobj = glu.gluNewQuadric();

+            long qobj = glu.gluNewQuadric();

 

             glu.gluQuadricDrawStyle(qobj,GLU_FILL);

             glu.gluQuadricNormals(qobj,GLU_SMOOTH);

diff --git a/demos/RonsDemos/shadowvol.java b/demos/RonsDemos/shadowvol.java
index f40f20b..f25d6dc 100644
--- a/demos/RonsDemos/shadowvol.java
+++ b/demos/RonsDemos/shadowvol.java
@@ -111,7 +111,7 @@ public class shadowvol extends Applet
             reshape(getSize().width, getSize().height);

 

             byte tex[];

-            int sphere, cone, base;

+            long sphere, cone, base;

             float sphere_mat[] = {1.0f, 0.5f, 0.0f, 1.0f};

             float cone_mat[] = {0.0f, 0.5f, 1.0f, 1.0f};

 

diff --git a/demos/RonsDemos/softshadow.java b/demos/RonsDemos/softshadow.java
index 0d9e8ef..c49a434 100644
--- a/demos/RonsDemos/softshadow.java
+++ b/demos/RonsDemos/softshadow.java
@@ -149,7 +149,7 @@ public class softshadow extends Applet
 

                 /* make display lists for sphere and cone; for efficiency */

 

-            int sphere, cone, base;

+            long sphere, cone, base;

 

             gl.glNewList(SPHERE, GL_COMPILE);

             sphere = glu.gluNewQuadric();

diff --git a/demos/RonsDemos/steam.java b/demos/RonsDemos/steam.java
index 3f19f7e..e89afde 100644
--- a/demos/RonsDemos/steam.java
+++ b/demos/RonsDemos/steam.java
@@ -95,7 +95,7 @@ public class steam extends SimpleGLAnimApplet1
         private int list_flywheel_filled = 4;

         private int list_flywheel_texture = 8;

             /* Variable used in the creaton of glu objects */

-        int obj;    // (GLU quadric object)

+        long obj;    // (GLU quadric object)

 

         private PopupMenu menu = null;

         private boolean menu_showing = false;

@@ -587,7 +587,7 @@ public class steam extends SimpleGLAnimApplet1
             /* Draws a cylinder using glu function, drawing flat discs

                at each end, to give the appearence of it being solid. */

         private void myCylinder

-            (int object, float outerRadius, float innerRadius, float length)

+            (long object, float outerRadius, float innerRadius, float length)

         {

             gl.glPushMatrix();

             glu.gluCylinder(object, outerRadius, outerRadius, length, 20, 1);

diff --git a/demos/RonsDemos/surface.java b/demos/RonsDemos/surface.java
index 2d959b8..a33f48b 100644
--- a/demos/RonsDemos/surface.java
+++ b/demos/RonsDemos/surface.java
@@ -102,7 +102,7 @@ public class surface extends Applet
     {

         float ctlpoints[] = new float [4*4*3];

         boolean showPoints = false;

-        int theNurb;

+        long theNurb;

 

         public surfaceCanvas(int w, int h)

         {

diff --git a/demos/RonsDemos/text3d.java b/demos/RonsDemos/text3d.java
index ed40bee..9d288d5 100644
--- a/demos/RonsDemos/text3d.java
+++ b/demos/RonsDemos/text3d.java
@@ -371,6 +371,7 @@ public class text3d extends SimpleGLAnimApplet1
             doubleBuffer = true;

             stereoView = false;

 	    accumSize = 8;

+	    setUseRepaint(false);

         }

     

         public void init()