X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Freflection%2FReflectionUtils.java;h=87a0b8c5e7b47741721ac8cd182cdaacb99f1537;hb=ddd261f331280640c5b53c7128230b629ebcd268;hp=1788f7402d569629b4789a50d619a866ea1e181a;hpb=48ade0b677efdb22a4964154c6ab365f1124a483;p=utils

diff --git a/support/general/src/main/java/org/wamblee/reflection/ReflectionUtils.java b/support/general/src/main/java/org/wamblee/reflection/ReflectionUtils.java
index 1788f740..87a0b8c5 100644
--- a/support/general/src/main/java/org/wamblee/reflection/ReflectionUtils.java
+++ b/support/general/src/main/java/org/wamblee/reflection/ReflectionUtils.java
@@ -1,42 +1,91 @@
 package org.wamblee.reflection;
 
+import java.lang.reflect.Method;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
 public class ReflectionUtils {
+    /**
+     * Wraps a type by the corresponding wrapper type if it is a primitive
+     * type.
+     * @param aClass Type to wrap.
+     * @return Wrapped type for primitives or the provided argument value.
+     */
+    public static Class wrapIfNeeded(Class aClass) {
+        if (aClass == boolean.class) {
+            return Boolean.class;
+        }
+
+        if (aClass == byte.class) {
+            return Byte.class;
+        }
+
+        if (aClass == char.class) {
+            return Character.class;
+        }
+
+        if (aClass == short.class) {
+            return Short.class;
+        }
+
+        if (aClass == int.class) {
+            return Integer.class;
+        }
+
+        if (aClass == long.class) {
+            return Long.class;
+        }
+
+        if (aClass == float.class) {
+            return Float.class;
+        }
+
+        if (aClass == double.class) {
+            return Double.class;
+        }
+
+        if (aClass == void.class) {
+            return Void.class;
+        }
+
+        return aClass;
+    }
+
+    public static List<Method> getAllMethods(Class aClass) {
+        Map<String, Method> found = new HashMap<String, Method>();
+        getAllMethods(aClass, found);
+
+        return new ArrayList<Method>(found.values());
+    }
+
+    private static void getAllMethods(Class aClass, Map<String, Method> aFound) {
+        List<Method> declared = Arrays.asList(aClass.getDeclaredMethods());
+
+        for (Method method : declared) {
+            Method superMethod = aFound.get(method.getName());
+
+            if (superMethod == null) {
+                // no superclass method
+                aFound.put(method.getName(), method);
+            } else {
+                // super class method. Check for override.
+                if (!Arrays.equals(superMethod.getParameterTypes(),
+                            method.getParameterTypes())) {
+                    // parameters differ so this is a new method.
+                    aFound.put(method.getName(), method);
+                }
+            }
+        }
+
+        Class superClass = aClass.getSuperclass();
 
-	/**
-	 * Wraps a type by the corresponding wrapper type if it is a primitive
-	 * type.
-	 * @param aClass Type to wrap. 
-	 * @return Wrapped type for primitives or the provided argument value. 
-	 */
-	public static Class wrapIfNeeded(Class aClass) {
-
-		if (aClass == boolean.class) {
-			return Boolean.class;
-		}
-		if (aClass == byte.class) {
-			return Byte.class;
-		}
-		if (aClass == char.class) {
-			return Character.class;
-		}
-		if (aClass == short.class) {
-			return Short.class;
-		}
-		if (aClass == int.class) {
-			return Integer.class;
-		}
-		if (aClass == long.class) {
-			return Long.class;
-		}
-		if (aClass == float.class) {
-			return Float.class;
-		}
-		if (aClass == double.class) {
-			return Double.class;
-		}
-		if (aClass == void.class) {
-			return Void.class;
-		}
-		return aClass;
-	}
+        if (superClass != null) {
+            getAllMethods(superClass, aFound);
+        }
+    }
 }