Submitted by: Travis

Remove all NURBS constants from the GLU bindings.  We are not publishing
bindings to the NURBS subset of GLU in this release of the JSR-231 API.
Previously, we removed the NURBS methods from the implementation/spec,
but not the NURBS-related constants, as they are specified in GLU 1.3.

 Modified Files:
 	make/glu-CustomJavaCode.java
 	src/classes/com/sun/opengl/impl/error/Error.java
----------------------------------------------------------------------


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

2 files changed, 90 insertions, 90 deletions

diff --git a/make/glu-CustomJavaCode.java b/make/glu-CustomJavaCode.java
index 370b5959b..42c483c05 100644
--- a/make/glu-CustomJavaCode.java
+++ b/make/glu-CustomJavaCode.java
@@ -1153,104 +1153,104 @@ public static final int GLU_INVALID_OPERATION = 100904;
 
 // NurbsDisplay
 // GLU_FILL
-public static final int GLU_OUTLINE_POLYGON = 100240;
-public static final int GLU_OUTLINE_PATCH = 100241;
+//public static final int GLU_OUTLINE_POLYGON = 100240;
+//public static final int GLU_OUTLINE_PATCH = 100241;
 
 // NurbsCallback
-public static final int GLU_NURBS_ERROR = 100103;
+//public static final int GLU_NURBS_ERROR = 100103;
 public static final int GLU_ERROR = 100103;
-public static final int GLU_NURBS_BEGIN = 100164;
-public static final int GLU_NURBS_BEGIN_EXT = 100164;
-public static final int GLU_NURBS_VERTEX = 100165;
-public static final int GLU_NURBS_VERTEX_EXT = 100165;
-public static final int GLU_NURBS_NORMAL = 100166;
-public static final int GLU_NURBS_NORMAL_EXT = 100166;
-public static final int GLU_NURBS_COLOR = 100167;
-public static final int GLU_NURBS_COLOR_EXT = 100167;
-public static final int GLU_NURBS_TEXTURE_COORD = 100168;
-public static final int GLU_NURBS_TEX_COORD_EXT = 100168;
-public static final int GLU_NURBS_END = 100169;
-public static final int GLU_NURBS_END_EXT = 100169;
-public static final int GLU_NURBS_BEGIN_DATA = 100170;
-public static final int GLU_NURBS_BEGIN_DATA_EXT = 100170;
-public static final int GLU_NURBS_VERTEX_DATA = 100171;
-public static final int GLU_NURBS_VERTEX_DATA_EXT = 100171;
-public static final int GLU_NURBS_NORMAL_DATA = 100172;
-public static final int GLU_NURBS_NORMAL_DATA_EXT = 100172;
-public static final int GLU_NURBS_COLOR_DATA = 100173;
-public static final int GLU_NURBS_COLOR_DATA_EXT = 100173;
-public static final int GLU_NURBS_TEXTURE_COORD_DATA = 100174;
-public static final int GLU_NURBS_TEX_COORD_DATA_EXT = 100174;
-public static final int GLU_NURBS_END_DATA = 100175;
-public static final int GLU_NURBS_END_DATA_EXT = 100175;
+//public static final int GLU_NURBS_BEGIN = 100164;
+//public static final int GLU_NURBS_BEGIN_EXT = 100164;
+//public static final int GLU_NURBS_VERTEX = 100165;
+//public static final int GLU_NURBS_VERTEX_EXT = 100165;
+//public static final int GLU_NURBS_NORMAL = 100166;
+//public static final int GLU_NURBS_NORMAL_EXT = 100166;
+//public static final int GLU_NURBS_COLOR = 100167;
+//public static final int GLU_NURBS_COLOR_EXT = 100167;
+//public static final int GLU_NURBS_TEXTURE_COORD = 100168;
+//public static final int GLU_NURBS_TEX_COORD_EXT = 100168;
+//public static final int GLU_NURBS_END = 100169;
+//public static final int GLU_NURBS_END_EXT = 100169;
+//public static final int GLU_NURBS_BEGIN_DATA = 100170;
+//public static final int GLU_NURBS_BEGIN_DATA_EXT = 100170;
+//public static final int GLU_NURBS_VERTEX_DATA = 100171;
+//public static final int GLU_NURBS_VERTEX_DATA_EXT = 100171;
+//public static final int GLU_NURBS_NORMAL_DATA = 100172;
+//public static final int GLU_NURBS_NORMAL_DATA_EXT = 100172;
+//public static final int GLU_NURBS_COLOR_DATA = 100173;
+//public static final int GLU_NURBS_COLOR_DATA_EXT = 100173;
+//public static final int GLU_NURBS_TEXTURE_COORD_DATA = 100174;
+//public static final int GLU_NURBS_TEX_COORD_DATA_EXT = 100174;
+//public static final int GLU_NURBS_END_DATA = 100175;
+//public static final int GLU_NURBS_END_DATA_EXT = 100175;
 
 // NurbsError
-public static final int GLU_NURBS_ERROR1 = 100251;
-public static final int GLU_NURBS_ERROR2 = 100252;
-public static final int GLU_NURBS_ERROR3 = 100253;
-public static final int GLU_NURBS_ERROR4 = 100254;
-public static final int GLU_NURBS_ERROR5 = 100255;
-public static final int GLU_NURBS_ERROR6 = 100256;
-public static final int GLU_NURBS_ERROR7 = 100257;
-public static final int GLU_NURBS_ERROR8 = 100258;
-public static final int GLU_NURBS_ERROR9 = 100259;
-public static final int GLU_NURBS_ERROR10 = 100260;
-public static final int GLU_NURBS_ERROR11 = 100261;
-public static final int GLU_NURBS_ERROR12 = 100262;
-public static final int GLU_NURBS_ERROR13 = 100263;
-public static final int GLU_NURBS_ERROR14 = 100264;
-public static final int GLU_NURBS_ERROR15 = 100265;
-public static final int GLU_NURBS_ERROR16 = 100266;
-public static final int GLU_NURBS_ERROR17 = 100267;
-public static final int GLU_NURBS_ERROR18 = 100268;
-public static final int GLU_NURBS_ERROR19 = 100269;
-public static final int GLU_NURBS_ERROR20 = 100270;
-public static final int GLU_NURBS_ERROR21 = 100271;
-public static final int GLU_NURBS_ERROR22 = 100272;
-public static final int GLU_NURBS_ERROR23 = 100273;
-public static final int GLU_NURBS_ERROR24 = 100274;
-public static final int GLU_NURBS_ERROR25 = 100275;
-public static final int GLU_NURBS_ERROR26 = 100276;
-public static final int GLU_NURBS_ERROR27 = 100277;
-public static final int GLU_NURBS_ERROR28 = 100278;
-public static final int GLU_NURBS_ERROR29 = 100279;
-public static final int GLU_NURBS_ERROR30 = 100280;
-public static final int GLU_NURBS_ERROR31 = 100281;
-public static final int GLU_NURBS_ERROR32 = 100282;
-public static final int GLU_NURBS_ERROR33 = 100283;
-public static final int GLU_NURBS_ERROR34 = 100284;
-public static final int GLU_NURBS_ERROR35 = 100285;
-public static final int GLU_NURBS_ERROR36 = 100286;
-public static final int GLU_NURBS_ERROR37 = 100287;
+//public static final int GLU_NURBS_ERROR1 = 100251;
+//public static final int GLU_NURBS_ERROR2 = 100252;
+//public static final int GLU_NURBS_ERROR3 = 100253;
+//public static final int GLU_NURBS_ERROR4 = 100254;
+//public static final int GLU_NURBS_ERROR5 = 100255;
+//public static final int GLU_NURBS_ERROR6 = 100256;
+//public static final int GLU_NURBS_ERROR7 = 100257;
+//public static final int GLU_NURBS_ERROR8 = 100258;
+//public static final int GLU_NURBS_ERROR9 = 100259;
+//public static final int GLU_NURBS_ERROR10 = 100260;
+//public static final int GLU_NURBS_ERROR11 = 100261;
+//public static final int GLU_NURBS_ERROR12 = 100262;
+//public static final int GLU_NURBS_ERROR13 = 100263;
+//public static final int GLU_NURBS_ERROR14 = 100264;
+//public static final int GLU_NURBS_ERROR15 = 100265;
+//public static final int GLU_NURBS_ERROR16 = 100266;
+//public static final int GLU_NURBS_ERROR17 = 100267;
+//public static final int GLU_NURBS_ERROR18 = 100268;
+//public static final int GLU_NURBS_ERROR19 = 100269;
+//public static final int GLU_NURBS_ERROR20 = 100270;
+//public static final int GLU_NURBS_ERROR21 = 100271;
+//public static final int GLU_NURBS_ERROR22 = 100272;
+//public static final int GLU_NURBS_ERROR23 = 100273;
+//public static final int GLU_NURBS_ERROR24 = 100274;
+//public static final int GLU_NURBS_ERROR25 = 100275;
+//public static final int GLU_NURBS_ERROR26 = 100276;
+//public static final int GLU_NURBS_ERROR27 = 100277;
+//public static final int GLU_NURBS_ERROR28 = 100278;
+//public static final int GLU_NURBS_ERROR29 = 100279;
+//public static final int GLU_NURBS_ERROR30 = 100280;
+//public static final int GLU_NURBS_ERROR31 = 100281;
+//public static final int GLU_NURBS_ERROR32 = 100282;
+//public static final int GLU_NURBS_ERROR33 = 100283;
+//public static final int GLU_NURBS_ERROR34 = 100284;
+//public static final int GLU_NURBS_ERROR35 = 100285;
+//public static final int GLU_NURBS_ERROR36 = 100286;
+//public static final int GLU_NURBS_ERROR37 = 100287;
 
 // NurbsProperty
-public static final int GLU_AUTO_LOAD_MATRIX = 100200;
-public static final int GLU_CULLING = 100201;
-public static final int GLU_SAMPLING_TOLERANCE = 100203;
-public static final int GLU_DISPLAY_MODE = 100204;
-public static final int GLU_PARAMETRIC_TOLERANCE = 100202;
-public static final int GLU_SAMPLING_METHOD = 100205;
-public static final int GLU_U_STEP = 100206;
-public static final int GLU_V_STEP = 100207;
-public static final int GLU_NURBS_MODE = 100160;
-public static final int GLU_NURBS_MODE_EXT = 100160;
-public static final int GLU_NURBS_TESSELLATOR = 100161;
-public static final int GLU_NURBS_TESSELLATOR_EXT = 100161;
-public static final int GLU_NURBS_RENDERER = 100162;
-public static final int GLU_NURBS_RENDERER_EXT = 100162;
+//public static final int GLU_AUTO_LOAD_MATRIX = 100200;
+//public static final int GLU_CULLING = 100201;
+//public static final int GLU_SAMPLING_TOLERANCE = 100203;
+//public static final int GLU_DISPLAY_MODE = 100204;
+//public static final int GLU_PARAMETRIC_TOLERANCE = 100202;
+//public static final int GLU_SAMPLING_METHOD = 100205;
+//public static final int GLU_U_STEP = 100206;
+//public static final int GLU_V_STEP = 100207;
+//public static final int GLU_NURBS_MODE = 100160;
+//public static final int GLU_NURBS_MODE_EXT = 100160;
+//public static final int GLU_NURBS_TESSELLATOR = 100161;
+//public static final int GLU_NURBS_TESSELLATOR_EXT = 100161;
+//public static final int GLU_NURBS_RENDERER = 100162;
+//public static final int GLU_NURBS_RENDERER_EXT = 100162;
 
 // NurbsSampling
-public static final int GLU_OBJECT_PARAMETRIC_ERROR = 100208;
-public static final int GLU_OBJECT_PARAMETRIC_ERROR_EXT = 100208;
-public static final int GLU_OBJECT_PATH_LENGTH = 100209;
-public static final int GLU_OBJECT_PATH_LENGTH_EXT = 100209;
-public static final int GLU_PATH_LENGTH = 100215;
-public static final int GLU_PARAMETRIC_ERROR = 100216;
-public static final int GLU_DOMAIN_DISTANCE = 100217;
+//public static final int GLU_OBJECT_PARAMETRIC_ERROR = 100208;
+//public static final int GLU_OBJECT_PARAMETRIC_ERROR_EXT = 100208;
+//public static final int GLU_OBJECT_PATH_LENGTH = 100209;
+//public static final int GLU_OBJECT_PATH_LENGTH_EXT = 100209;
+//public static final int GLU_PATH_LENGTH = 100215;
+//public static final int GLU_PARAMETRIC_ERROR = 100216;
+//public static final int GLU_DOMAIN_DISTANCE = 100217;
 
 // NurbsTrim
-public static final int GLU_MAP1_TRIM_2 = 100210;
-public static final int GLU_MAP1_TRIM_3 = 100211;
+//public static final int GLU_MAP1_TRIM_2 = 100210;
+//public static final int GLU_MAP1_TRIM_3 = 100211;
 
 // QuadricDrawStyle
 public static final int GLU_POINT = 100010;
diff --git a/src/classes/com/sun/opengl/impl/error/Error.java b/src/classes/com/sun/opengl/impl/error/Error.java
index b19fb4903..095bf5471 100644
--- a/src/classes/com/sun/opengl/impl/error/Error.java
+++ b/src/classes/com/sun/opengl/impl/error/Error.java
@@ -77,9 +77,9 @@ public class Error {
     if( (errorCode >= GLU.GLU_INVALID_ENUM) && (errorCode <= GLU.GLU_INVALID_OPERATION) ) {
       return( gluErrorStrings[ errorCode - GLU.GLU_INVALID_ENUM ] );
     }
-    if( (errorCode >= GLU.GLU_NURBS_ERROR1) && (errorCode <= GLU.GLU_NURBS_ERROR37) ) {
-      return( gluErrorStrings[ errorCode - (GLU.GLU_NURBS_ERROR1 - 1) ] );
-    }
+//    if( (errorCode >= GLU.GLU_NURBS_ERROR1) && (errorCode <= GLU.GLU_NURBS_ERROR37) ) {
+//      return( gluErrorStrings[ errorCode - (GLU.GLU_NURBS_ERROR1 - 1) ] );
+//    }
     if( (errorCode >= GLU.GLU_TESS_ERROR1) && (errorCode <= GLU.GLU_TESS_ERROR8) ) {
       return( gluErrorStrings[ errorCode - (GLU.GLU_TESS_ERROR1 - 1) ] );
     }