3 files changed, 130 insertions, 28 deletions

diff --git a/src/classes/com/sun/opengl/impl/GLContextImpl.java b/src/classes/com/sun/opengl/impl/GLContextImpl.java
index 6bec8c1e5..fd3b73b42 100644
--- a/src/classes/com/sun/opengl/impl/GLContextImpl.java
+++ b/src/classes/com/sun/opengl/impl/GLContextImpl.java
@@ -226,10 +226,8 @@ public abstract class GLContextImpl extends GLContext {
   // Helpers for various context implementations
   //
 
-  private Object createObject(String suffix, Class[] cstrArgs) {
+  private Object createInstance(String suffix, Class[] cstrArgTypes, Object[] cstrArgs) {
     String clazzName = null;
-    Class factoryClass = null;
-    Constructor factory = null;
 
     try {
         if(GLProfile.isGL2()) {
@@ -241,22 +239,7 @@ public abstract class GLContextImpl extends GLContext {
         } else {
             throw new GLException("uncovered profile");
         }
-        factoryClass = Class.forName(clazzName);
-        if (factoryClass == null) {
-          throw new GLException(clazzName + " not yet implemented");
-        }
-        try {
-            factory = factoryClass.getDeclaredConstructor( cstrArgs );
-        } catch(NoSuchMethodException nsme) {
-          throw new GLException("Constructor: '" + clazzName + "("+cstrArgs+")' not found");
-        }
-        if(cstrArgs.length==0) {
-            return factory.newInstance(null);
-        }
-        if(cstrArgs[0].equals(GLContextImpl.class)) {
-            return factory.newInstance(new Object[] { this });
-        }
-        throw new GLException("Constructor: '" + clazzName + "("+cstrArgs[0]+")' not yet supported");
+        return GLReflection.createInstance(clazzName, cstrArgTypes, cstrArgs);
     } catch (Exception e) {
       throw new GLException(e);
     }
@@ -264,7 +247,7 @@ public abstract class GLContextImpl extends GLContext {
 
   /** Create the GL for this context. */
   protected GL createGL() {
-    GL gl = (GL) createObject("Impl", new Class[] { GLContextImpl.class } );
+    GL gl = (GL) createInstance("Impl", new Class[] { GLContextImpl.class }, new Object[] { this } );
 
     /* FIXME: refactor dependence on Java 2D / JOGL bridge
     if (tracker != null) {
@@ -344,7 +327,7 @@ public abstract class GLContextImpl extends GLContext {
       System.err.println(getThreadName() + ": !!! Initializing OpenGL extension address table for " + this);
     }
     if (glProcAddressTable == null) {
-      glProcAddressTable = (ProcAddressTable) createObject("ProcAddressTable", new Class[0]);
+      glProcAddressTable = (ProcAddressTable) createInstance("ProcAddressTable", new Class[0], null);
       // FIXME: cache ProcAddressTables by capability bits so we can
       // share them among contexts with the same capabilities
     }
diff --git a/src/classes/com/sun/opengl/impl/GLReflection.java b/src/classes/com/sun/opengl/impl/GLReflection.java
new file mode 100644
index 000000000..94e004f30
--- /dev/null
+++ b/src/classes/com/sun/opengl/impl/GLReflection.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2003 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.opengl.impl;
+
+import java.lang.reflect.*;
+import javax.media.opengl.*;
+
+public final class GLReflection {
+
+  public static final Constructor getConstructor(String clazzName, Class[] cstrArgTypes) {
+    Class factoryClass = null;
+    Constructor factory = null;
+
+    try {
+        factoryClass = Class.forName(clazzName);
+        if (factoryClass == null) {
+          throw new GLException(clazzName + " not available");
+        }
+        try {
+            factory = factoryClass.getDeclaredConstructor( cstrArgTypes );
+        } catch(NoSuchMethodException nsme) {
+          throw new GLException("Constructor: '" + clazzName + "("+cstrArgTypes+")' not found");
+        }
+        return factory;
+    } catch (Exception e) {
+      throw new GLException(e);
+    }
+  }
+
+  public static final Constructor getConstructor(String clazzName) {
+    return getConstructor(clazzName, new Class[0]);
+  }
+
+  public static final Object createInstance(String clazzName, Class[] cstrArgTypes, Object[] cstrArgs) {
+    Constructor factory = null;
+
+    try {
+        factory = getConstructor(clazzName, cstrArgTypes);
+        return factory.newInstance( cstrArgs ) ;
+    } catch (Exception e) {
+      throw new GLException(e);
+    }
+  }
+
+  public static final Object createInstance(String clazzName, Object[] cstrArgs) {
+    Class[] cstrArgTypes = new Class[cstrArgs.length];
+    for(int i=0; i<cstrArgs.length; i++) {
+        cstrArgTypes[i] = cstrArgs[i].getClass();
+    }
+    return createInstance(clazzName, cstrArgTypes, cstrArgs);
+  }
+
+  public static final Object createInstance(String clazzName) {
+    return createInstance(clazzName, new Class[0], null);
+  }
+
+  public static final boolean instanceOf(Object obj, String clazzName) {
+    Class clazz = obj.getClass();
+    do {
+        if(clazz.getName().equals(clazzName)) {
+            return true;
+        }
+        clazz = clazz.getSuperclass();
+    } while (clazz!=null);
+    return false;
+  }
+
+  public static final boolean implementationOf(Object obj, String faceName) {
+    Class[] clazzes = obj.getClass().getInterfaces();
+    for(int i=clazzes.length-1; i>=0; i--) {
+        Class face = clazzes[i];
+        if(face.getName().equals(faceName)) {
+            return true;
+        }
+    }
+    return false;
+  }
+
+}
+
diff --git a/src/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java b/src/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java
index 9ba2a0c40..a01dd91c7 100755
--- a/src/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java
+++ b/src/classes/com/sun/opengl/impl/egl/EGLDrawableFactory.java
@@ -57,18 +57,23 @@ public class EGLDrawableFactory extends GLDrawableFactoryImpl {
 
         // Try several variants
         List/*<String>*/ glesLibNames = new ArrayList();
-        // Windows
-        glesLibNames.add("libGLES_CM");
-        glesLibNames.add("libGLES_CL");
-        // Unix
-        glesLibNames.add("GLES_CM");
-        glesLibNames.add("GLES_CL");
-        // NVidia APX 2500
+
         if (GLProfile.isGLES2()) {
+            // Unix
+            glesLibNames.add("libGLESv2");
             glesLibNames.add("libGLESv2_CM");
+            // Windows
+            glesLibNames.add("GLESv2");
             glesLibNames.add("GLESv2_CM");
         } else if (GLProfile.isGLES1()) {
+            // Unix
+            glesLibNames.add("libGLES_CM");
+            glesLibNames.add("libGLES_CL");
             glesLibNames.add("libGLESv1_CM");
+
+            // Windows
+            glesLibNames.add("GLES_CM");
+            glesLibNames.add("GLES_CL");
             glesLibNames.add("GLESv1_CM");
         } else {
             throw new GLException("Invalid GL Profile for EGL: "+GLProfile.getProfile());