4 files changed, 23 insertions, 21 deletions
diff --git a/make/glu-CustomJavaCode-base.java b/make/glu-CustomJavaCode-base.java
index e0d5abc5e..f21f4ed5c 100755
--- a/make/glu-CustomJavaCode-base.java
+++ b/make/glu-CustomJavaCode-base.java
@@ -115,6 +115,25 @@ public static final GL getCurrentGL() throws GLException {
   return curContext.getGL();
 }
 
+public final String gluErrorString(int errorCode) {
+  return Error.gluErrorString(errorCode);
+}
+
+/* extName is an extension name.
+ * extString is a string of extensions separated by blank(s). There may or 
+ * may not be leading or trailing blank(s) in extString.
+ * This works in cases of extensions being prefixes of another like
+ * GL_EXT_texture and GL_EXT_texture3D.
+ * Returns true if extName is found otherwise it returns false.
+ */
+public final boolean gluCheckExtension(java.lang.String extName, java.lang.String extString) {
+  return Registry.gluCheckExtension(extName, extString);
+}
+
+public final String gluGetString(int name) {
+  return Registry.gluGetString(name);
+}
+
 //----------------------------------------------------------------------
 // Tessellation routines
 //
diff --git a/make/glu-CustomJavaCode-gl2.java b/make/glu-CustomJavaCode-gl2.java
index 247e37c87..b1d35532c 100644
--- a/make/glu-CustomJavaCode-gl2.java
+++ b/make/glu-CustomJavaCode-gl2.java
@@ -46,25 +46,6 @@ public static final GL2 getCurrentGL2() throws GLException {
   return curContext.getGL().getGL2();
 }
 
-public final String gluErrorString(int errorCode) {
-  return Error.gluErrorString(errorCode);
-}
-
-/* extName is an extension name.
- * extString is a string of extensions separated by blank(s). There may or 
- * may not be leading or trailing blank(s) in extString.
- * This works in cases of extensions being prefixes of another like
- * GL_EXT_texture and GL_EXT_texture3D.
- * Returns true if extName is found otherwise it returns false.
- */
-public final boolean gluCheckExtension(java.lang.String extName, java.lang.String extString) {
-  return Registry.gluCheckExtension(extName, extString);
-}
-
-public final String gluGetString(int name) {
-  return Registry.gluGetString(name);
-}
-
 /**
  * Returns true if the specified GLU core- or extension-function can be
  * successfully used through this GLU instance. By "successfully" we mean
diff --git a/make/glu-base.cfg b/make/glu-base.cfg
index 39a699eee..478803347 100755
--- a/make/glu-base.cfg
+++ b/make/glu-base.cfg
@@ -19,6 +19,10 @@ Ignore gluScaleImage
 # Custom Java code for GLU class
 IncludeAs CustomJavaCode GLU glu-CustomJavaCode-base.java
 
+# Imports for the Error and Registry classes
+Import com.sun.opengl.impl.glu.error.Error
+Import com.sun.opengl.impl.glu.registry.Registry
+
 Include glu-common.cfg
 
 Import java.lang.reflect.*
diff --git a/make/glu-gl2.cfg b/make/glu-gl2.cfg
index 068b47675..0ebf23258 100755
--- a/make/glu-gl2.cfg
+++ b/make/glu-gl2.cfg
@@ -38,8 +38,6 @@ IncludeAs CustomJavaCode GLUgl2 glu-CustomJavaCode-gl2.java
 # GLU needs access to the GLUtesselatorImpl class for GLUtesselator,
 # to the Mipmap class for scaling and mipmap generation,
 # and to the nurbs.* package for the NURBS functionality
-Import com.sun.opengl.impl.glu.error.Error
-Import com.sun.opengl.impl.glu.registry.Registry
 Import com.sun.opengl.impl.glu.nurbs.*
 Import java.security.*
 Import com.sun.gluegen.runtime.opengl.GLProcAddressHelper