You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2006/05/18 02:50:21 UTC

svn commit: r407417 - /geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java

Author: gnodet
Date: Wed May 17 17:50:21 2006
New Revision: 407417

URL: http://svn.apache.org/viewvc?rev=407417&view=rev
Log:
Allow xbean annotations to be retrieved on parent classes

Modified:
    geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java

Modified: geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java?rev=407417&r1=407416&r2=407417&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java (original)
+++ geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java Wed May 17 17:50:21 2006
@@ -209,24 +209,27 @@
         String initMethod = null;
         String destroyMethod = null;
         String factoryMethod = null;
-        JavaMethod[] methods = javaClass.getMethods();
-        for (int i = 0; i < methods.length; i++) {
-            JavaMethod method = methods[i];
-            if (method.isPublic() && !method.isConstructor()) {
-                if (method.getTagByName(INIT_METHOD_ANNOTATION) != null) {
-                    initMethod = method.getName();
-                }
-                if (method.getTagByName(DESTROY_METHOD_ANNOTATION) != null) {
-                    destroyMethod = method.getName();
+        for (JavaClass jClass = javaClass; jClass != null; jClass = jClass.getSuperJavaClass()) {
+            JavaMethod[] methods = javaClass.getMethods();
+            for (int i = 0; i < methods.length; i++) {
+                JavaMethod method = methods[i];
+                if (method.isPublic() && !method.isConstructor()) {
+                    if (initMethod == null && method.getTagByName(INIT_METHOD_ANNOTATION) != null) {
+                        initMethod = method.getName();
+                    }
+                    if (destroyMethod == null && method.getTagByName(DESTROY_METHOD_ANNOTATION) != null) {
+                        destroyMethod = method.getName();
+                    }
+                    if (factoryMethod == null && method.getTagByName(FACTORY_METHOD_ANNOTATION) != null) {
+                        factoryMethod = method.getName();
+                    }
+                    
                 }
-                if (method.getTagByName(FACTORY_METHOD_ANNOTATION) != null) {
-                    factoryMethod = method.getName();
-                }
-                
             }
         }
 
         List constructorArgs = new ArrayList();
+        JavaMethod[] methods = javaClass.getMethods();
         for (int i = 0; i < methods.length; i++) {
             JavaMethod method = methods[i];
             JavaParameter[] parameters = method.getParameters();