Merge pull request #34 from lafoletc/GstTypes.classFor()

Correct regression in GstTypes.classFor()

Author: neilcsmith-net

src/org/freedesktop/gstreamer/ElementFactory.java

@@ -227,6 +227,8 @@ private static Element elementFor(Pointer ptr, String factoryName) {
         Class<? extends Element> cls = ElementFactory.typeMap.get(factoryName);
         if (cls == null) {
             cls = (Class<Element>)GstTypes.classFor(Element.getType(ptr));
+            if (cls == null) cls = Element.class;
+
             ElementFactory.typeMap.put(factoryName, cls);
         }
         return NativeObject.objectFor(ptr, cls, false);

src/org/freedesktop/gstreamer/lowlevel/GstTypes.java

@@ -48,7 +48,7 @@ public static void registerType(Class<? extends NativeObject> cls, String gTypeN
      * Retrieve the class of a GType
      *
      * @param gType The type of Class
-     * @return The Class of the desired type.
+     * @return The Class of the desired type or null.
      */
     public static final Class<? extends NativeObject> classFor(final GType gType) {
     	final String gTypeName = gType.getTypeName();
@@ -61,7 +61,7 @@ public static final Class<? extends NativeObject> classFor(final GType gType) {
 
         // Search for a parent class registration
         GType type = gType.getParentType();
-        while (!type.equals(GType.OBJECT) && !type.equals(GType.INVALID)) {
+        while (!type.equals(GType.OBJECT) && !type.equals(GType.POINTER) && !type.equals(GType.INVALID)) {
            	cls = gtypeNameMap.get(type.getTypeName());
             if (cls != null) {
                 if (GstTypes.logger.isLoggable(Level.FINER)) {
@@ -73,9 +73,8 @@ public static final Class<? extends NativeObject> classFor(final GType gType) {
         	type = type.getParentType();
         }
 
-        // Should never appeared
-        throw new IllegalStateException("Could not find a registered class for " + gType);
-
+        // No registered class found for this gType
+        return null;
     }
 
     public static final GType typeFor(Class<? extends NativeObject> cls) {

src/org/freedesktop/gstreamer/lowlevel/NativeObject.java

@@ -190,7 +190,7 @@ public static <T extends NativeObject> T objectFor(Pointer ptr, Class<T> cls, in
 		// exact class match
 		//
         if (gType != null) {
-            cls = NativeObject.classFor(ptr, gType);
+            cls = NativeObject.classFor(ptr, gType, cls);
         }
 
         try {
@@ -213,13 +213,15 @@ public static <T extends NativeObject> T objectFor(Pointer ptr, Class<T> cls, in
     }
 
     @SuppressWarnings("unchecked")
-    protected static <T extends NativeObject> Class<T> classFor(Pointer ptr, final GType gType) {
-        Class<? extends NativeObject> cls = GstTypes.classFor(gType);
-
-    	if (cls.isAnnotationPresent(HasSubtype.class)) {
-    		cls = (Class<T>)SubtypeMapper.subtypeFor(cls, ptr);
-    	}
-    	return (Class<T>)cls;
+    protected static <T extends NativeObject> Class<T> classFor(Pointer ptr, final GType gType, final Class<T> defaultClass) {
+        Class<T> cls = (Class<T>)GstTypes.classFor(gType);
+        if (cls == null) cls = defaultClass;
+        
+		if (cls.isAnnotationPresent(HasSubtype.class)) {
+			cls = (Class<T>)SubtypeMapper.subtypeFor(cls, ptr);
+		}
+    	
+    	return cls;
     }
 
     @Override