X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Freflection%2FReflectionUtils.java;h=7c5c45f94fd7f1e2d44a58fafbf38b7cd3f444f2;hb=a182ac0a12646774077ebb3648c996030eff8e20;hp=ee18b11521d1cdca4eba85c9c92438d82a8452f0;hpb=8de36ff0206c996baf3ee4adc3e2293b12ff5f39;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 ee18b115..7c5c45f9 100644
--- a/support/general/src/main/java/org/wamblee/reflection/ReflectionUtils.java
+++ b/support/general/src/main/java/org/wamblee/reflection/ReflectionUtils.java
@@ -1,13 +1,33 @@
+/*
+ * Copyright 2005-2010 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.wamblee.reflection;
 
+import java.lang.reflect.Field;
 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;
 
+/**
+ * Some utilities for reflection. 
+ * 
+ * @author Erik Brakkee
+ */
 public class ReflectionUtils {
     /**
      * Wraps a type by the corresponding wrapper type if it is a primitive type.
@@ -56,24 +76,30 @@ public class ReflectionUtils {
         return aClass;
     }
 
-    public static List<Method> getAllMethods(Class aClass) {
+    public static List<Method> getAllMethods(Class aClass,
+        Class... aExcludedClasses) {
+        if (aClass.isInterface()) {
+            throw new IllegalArgumentException(aClass.getName() +
+                " is not an interface.");
+        }
         Map<String, Method> found = new HashMap<String, Method>();
-        getAllMethods(aClass, found);
+        getAllMethods(aClass, found, Arrays.asList(aExcludedClasses));
 
         return new ArrayList<Method>(found.values());
     }
 
-    private static void getAllMethods(Class aClass, Map<String, Method> aFound) {
+    private static void getAllMethods(Class aClass, Map<String, Method> aFound,
+        List<Class> aExcludedClasses) {
         List<Method> declared = Arrays.asList(aClass.getDeclaredMethods());
 
         for (Method method : declared) {
             Method superMethod = aFound.get(method.getName());
 
             if (superMethod == null) {
-                // no superclass method
+                // no subclass method
                 aFound.put(method.getName(), method);
             } else {
-                // super class method. Check for override.
+                // subclass method. Check for override.
                 if (!Arrays.equals(superMethod.getParameterTypes(), method
                     .getParameterTypes())) {
                     // parameters differ so this is a new method.
@@ -84,8 +110,35 @@ public class ReflectionUtils {
 
         Class superClass = aClass.getSuperclass();
 
-        if (superClass != null) {
-            getAllMethods(superClass, aFound);
+        if (superClass != null && !aExcludedClasses.contains(superClass)) {
+            getAllMethods(superClass, aFound, aExcludedClasses);
+        }
+    }
+
+    public static List<Field> getAllFields(Class aClass,
+        Class... aExcludedClasses) {
+        if (aClass.isInterface()) {
+            throw new IllegalArgumentException(aClass.getName() +
+                " is an interface.");
+        }
+        List<Field> found = new ArrayList<Field>();
+        getAllFields(aClass, found, Arrays.asList(aExcludedClasses));
+
+        return found;
+    }
+
+    private static void getAllFields(Class aClass, List<Field> aFound,
+        List<Class> aExcludedClasses) {
+        List<Field> declared = Arrays.asList(aClass.getDeclaredFields());
+
+        for (Field field : declared) {
+            aFound.add(field);
+        }
+
+        Class superClass = aClass.getSuperclass();
+
+        if (superClass != null && !aExcludedClasses.contains(superClass)) {
+            getAllFields(superClass, aFound, aExcludedClasses);
         }
     }
 }