renamed com.sun.gluegen.runtime -> com.jogamp.gluegen.runtime.

5 files changed, 8 insertions, 195 deletions

diff --git a/src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java b/src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java
index e83b43cdc..16accfe83 100644
--- a/src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java
+++ b/src/java/com/sun/gluegen/opengl/BuildComposablePipeline.java
@@ -374,7 +374,7 @@ public class BuildComposablePipeline
       CodeGenUtils.emitJavaHeaders(output, 
                   outputPackage,
                   outputClassName,
-                  "com.sun.gluegen.runtime", // FIXME: should make configurable
+                  "com.jogamp.gluegen.runtime", // FIXME: should make configurable
                   true,
                   importNames,
                   new String[] { "public" },
diff --git a/src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java b/src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java
index 8653b076e..f7a7fe030 100644
--- a/src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java
+++ b/src/java/com/sun/gluegen/opengl/BuildStaticGLInfo.java
@@ -282,9 +282,9 @@ public class BuildStaticGLInfo
     output.println("  public static String getFunctionAssociation(String glFunctionName)");
     output.println("  {");
     output.println("    String mappedName = null;");
-    output.println("    int  funcNamePermNum = com.sun.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutationNumber(glFunctionName);");
+    output.println("    int  funcNamePermNum = com.jogamp.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutationNumber(glFunctionName);");
     output.println("    for(int i = 0; null==mappedName && i < funcNamePermNum; i++) {");
-    output.println("        String tmp = com.sun.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutation(glFunctionName, i);");
+    output.println("        String tmp = com.jogamp.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutation(glFunctionName, i);");
     output.println("        try {");
     output.println("          mappedName = (String)funcToAssocMap.get(tmp);");
     output.println("        } catch (Exception e) { }");
diff --git a/src/java/com/sun/gluegen/opengl/GLConfiguration.java b/src/java/com/sun/gluegen/opengl/GLConfiguration.java
index 5e7ef7a89..19cf85a74 100755
--- a/src/java/com/sun/gluegen/opengl/GLConfiguration.java
+++ b/src/java/com/sun/gluegen/opengl/GLConfiguration.java
@@ -44,7 +44,7 @@ import java.util.*;
 
 import com.sun.gluegen.*;
 import com.sun.gluegen.procaddress.*;
-import com.sun.gluegen.runtime.opengl.GLExtensionNames;
+import com.jogamp.gluegen.runtime.opengl.GLExtensionNames;
 
 public class GLConfiguration extends ProcAddressConfiguration {
   // The following data members support ignoring an entire extension at a time
diff --git a/src/java/com/sun/gluegen/opengl/GLEmitter.java b/src/java/com/sun/gluegen/opengl/GLEmitter.java
index ff307c432..e9ae750f8 100644
--- a/src/java/com/sun/gluegen/opengl/GLEmitter.java
+++ b/src/java/com/sun/gluegen/opengl/GLEmitter.java
@@ -45,7 +45,7 @@ import java.util.*;
 import com.sun.gluegen.*;
 import com.sun.gluegen.cgram.types.*;
 import com.sun.gluegen.procaddress.*;
-import com.sun.gluegen.runtime.opengl.GLExtensionNames;
+import com.jogamp.gluegen.runtime.opengl.GLExtensionNames;
 
 /**
  * A subclass of ProcAddressEmitter with special OpenGL-specific
@@ -433,12 +433,12 @@ public class GLEmitter extends ProcAddressEmitter {
     w.println("   *   it was statically linked.");
     w.println("   */");
     w.println("  public long getAddressFor(String functionNameUsr) {");
-    w.println("    String functionNameBase = com.sun.gluegen.runtime.opengl.GLExtensionNames.normalizeVEN(com.sun.gluegen.runtime.opengl.GLExtensionNames.normalizeARB(functionNameUsr, true), true);");
+    w.println("    String functionNameBase = com.jogamp.gluegen.runtime.opengl.GLExtensionNames.normalizeVEN(com.jogamp.gluegen.runtime.opengl.GLExtensionNames.normalizeARB(functionNameUsr, true), true);");
     w.println("    String addressFieldNameBase = " + getProcAddressConfig().gluegenRuntimePackage() + ".ProcAddressHelper.PROCADDRESS_VAR_PREFIX + functionNameBase;");
     w.println("    java.lang.reflect.Field addressField = null;");
-    w.println("    int  funcNamePermNum = com.sun.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutationNumber(functionNameBase);");
+    w.println("    int  funcNamePermNum = com.jogamp.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutationNumber(functionNameBase);");
     w.println("    for(int i = 0; null==addressField && i < funcNamePermNum; i++) {");
-    w.println("        String addressFieldName = com.sun.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutation(addressFieldNameBase, i);");
+    w.println("        String addressFieldName = com.jogamp.gluegen.runtime.opengl.GLExtensionNames.getFuncNamePermutation(addressFieldNameBase, i);");
     w.println("        try {");
     w.println("          addressField = getClass().getField(addressFieldName);");
     w.println("        } catch (Exception e) { }");
diff --git a/src/java/com/sun/gluegen/runtime/opengl/GLExtensionNames.java b/src/java/com/sun/gluegen/runtime/opengl/GLExtensionNames.java
deleted file mode 100644
index 3c6f6002a..000000000
--- a/src/java/com/sun/gluegen/runtime/opengl/GLExtensionNames.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * - Redistribution of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * 
- * - Redistribution in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * 
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * This software is provided "AS IS," without a warranty of any kind. ALL
- * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
- * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
- * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
- * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
- * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
- * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
- * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
- * You acknowledge that this software is not designed or intended for use
- * in the design, construction, operation or maintenance of any nuclear
- * facility.
- * 
- */
-
-package com.sun.gluegen.runtime.opengl;
-
-import java.util.*;
-import com.sun.gluegen.runtime.*;
-
-public class GLExtensionNames {
-    //GL_XYZ : GL_XYZ, GL_XYZ_GL2, GL_XYZ_ARB, GL_XYZ_OES, GL_XYZ_OML
-    //GL_XYZ : GL_XYZ, GL_GL2_XYZ, GL_ARB_XYZ, GL_OES_XYZ, GL_OML_XYZ
-    //
-    // Pass-1 Unify ARB extensions with the same value
-    // Pass-2 Unify vendor extensions, 
-    //        if exist as an ARB extension with the same value.
-    // Pass-3 Emit
-
-    public static final String[] extensionsARB = { "ARB", "GL2", "OES", "KHR", "OML" };
-    public static final String[] extensionsVEN = { "3DFX", 
-                                                   "AMD",
-                                                   "APPLE",
-                                                   "ATI",
-                                                   "EXT",
-                                                   "HP",
-                                                   "IBM",
-                                                   "MESA",
-                                                   "MESAX",
-                                                   "NV",
-                                                   "SGI",
-                                                   "SGIS",
-                                                   "SGIX",
-                                                   "SUN",
-                                                   "WIN"
-                                                   };
-
-
-    public static final boolean isGLFunction(String str) {
-        return str.startsWith("gl")  || /* str.startsWith("glu") || str.startsWith("glX") || */
-               str.startsWith("egl") || str.startsWith("wgl") || str.startsWith("agl") ||
-               str.startsWith("cgl") ;
-    }
-
-    public static final boolean isGLEnumeration(String str) {
-        return str.startsWith("GL_")  || str.startsWith("GLU_") || str.startsWith("GLX_") ||
-               str.startsWith("EGL_") || str.startsWith("WGL_") || str.startsWith("AGL_") ||
-               str.startsWith("CGL_") ;
-    }
-
-    public static final int getExtensionIdx(String[] extensions, String str, boolean isGLFunc) {
-        if(isGLFunc) {
-            for(int i = extensions.length - 1 ; i>=0 ; i--) {
-                if( str.endsWith(extensions[i]) ) {
-                    return i;
-                }
-            }
-        } else {
-            for(int i = extensions.length - 1 ; i>=0 ; i--) {
-                if( str.endsWith("_"+extensions[i]) ) {
-                    return i;
-                }
-            }
-        }
-        return -1;
-    }
-
-    public static final boolean isExtension(String[] extensions, String str, boolean isGLFunc) {
-        return getExtensionIdx(extensions, str, isGLFunc)>=0;
-    }
-
-    public static final String getExtensionSuffix(String str, boolean isGLFunc) {
-        int idx = getExtensionIdx(extensionsARB, str, isGLFunc);
-        if(idx>=0) {
-            return extensionsARB[idx];
-        }
-        idx = getExtensionIdx(extensionsVEN, str, isGLFunc);
-        if(idx>=0) {
-            return extensionsVEN[idx];
-        }
-        return null;
-    }
-
-    public static final String normalize(String[] extensions, String str, boolean isGLFunc) {
-        boolean touched = false;
-        for(int i = extensions.length - 1 ; !touched && i>=0 ; i--) {
-            if(isGLFunc) {
-                if(str.endsWith(extensions[i])) {
-                    // functions
-                    str = str.substring(0, str.length()-extensions[i].length());
-                    touched=true;
-                }
-            } else {
-                if(str.endsWith("_"+extensions[i])) {
-                    // enums
-                    str = str.substring(0, str.length()-1-extensions[i].length());
-                    touched=true;
-                }
-            }
-        }
-        return str;
-    }
-    public static final String normalizeARB(String str, boolean isGLFunc) {
-        return normalize(extensionsARB, str, isGLFunc);
-    }
-    public static final boolean isExtensionARB(String str, boolean isGLFunc) {
-        return isExtension(extensionsARB, str, isGLFunc);
-    }
-    public static final String normalizeVEN(String str, boolean isGLFunc) {
-        return normalize(extensionsVEN, str, isGLFunc);
-    }
-    public static final boolean isExtensionVEN(String str, boolean isGLFunc) {
-        return isExtension(extensionsVEN, str, isGLFunc);
-    }
-    public static final String normalize(String str, boolean isGLFunc) {
-        if (isExtensionARB(str, isGLFunc)) {
-            return normalizeARB(str, isGLFunc);
-        }
-        if (isExtensionVEN(str, isGLFunc)) {
-            return normalizeVEN(str, isGLFunc);
-        }
-        return str;
-    }
-    public static final boolean isExtension(String str, boolean isGLFunc) {
-        return isExtension(extensionsARB, str, isGLFunc) || 
-               isExtension(extensionsVEN, str, isGLFunc);
-    }
-
-    public static final int getFuncNamePermutationNumber(String name) {
-        if(isExtensionARB(name, true) || isExtensionVEN(name, true)) {
-            // no name permutation, if it's already a known extension
-            return 1;
-        }
-        return 1 + extensionsARB.length + extensionsVEN.length;
-    }
-
-    public static final String getFuncNamePermutation(String name, int i) {
-        // identity
-        if(i==0) {
-            return name;
-        }
-        if(0>i || i>=(1+extensionsARB.length + extensionsVEN.length)) {
-            throw new RuntimeException("Index out of range [0.."+(1+extensionsARB.length+extensionsVEN.length-1)+"]: "+i);
-        }
-        // ARB
-        i-=1;
-        if(i<extensionsARB.length) {
-            return name+extensionsARB[i];
-        }
-        // VEN
-        i-=extensionsARB.length;
-        return name+extensionsVEN[i];
-    }
-}
-