[jboss-cvs] JBossAS SVN: r66035 - projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation.

[jboss-cvs-commits at lists.jboss.org]

Author: flavia.rainone at jboss.com
Date: 2007-10-11 12:59:37 -0400 (Thu, 11 Oct 2007)
New Revision: 66035

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AnnotatedParameterAdviceInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/ParameterAnnotationRule.java
Log:
[JBAOP-478] Bug solved.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AnnotatedParameterAdviceInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AnnotatedParameterAdviceInfo.java	2007-10-11 16:45:32 UTC (rev 66034)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AnnotatedParameterAdviceInfo.java	2007-10-11 16:59:37 UTC (rev 66035)
@@ -461,7 +461,7 @@
          {
             AdviceMethodFactory.appendNewMatchingMessage(method, rule);
             AdviceMethodFactory.appendMatchingMessage("-annotated parameter is not assignable from expected type ");
-            AdviceMethodFactory.appendMatchingMessage(((Class) rule.getAssignableFrom(properties)).getName());
+            AdviceMethodFactory.appendMatchingMessage(((Type) rule.getAssignableFrom(properties)));
             return false;
          }
          return  true;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/ParameterAnnotationRule.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/ParameterAnnotationRule.java	2007-10-11 16:45:32 UTC (rev 66034)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/ParameterAnnotationRule.java	2007-10-11 16:59:37 UTC (rev 66035)
@@ -167,10 +167,14 @@
    }
 
    /**
-    * Returns the class from which the annotated parameter must be assignable.
+    * Returns the type from which the annotated parameter must be assignable.
     * 
     * @param properties describes the queried advice method
-    * @return the class from which the annotated parameter must be assignable
+    * 
+    * @return the type or types from which the annotated parameter must be assignable.
+    *         If this rule {@link #isSingleEnforced() is single enforced}, the return
+    *         type is <code>java.lang.reflect.Type</code>; otherwise, it is
+    *         <code>java.lang.reflect.Type[]</code>.
     */
    public Object getAssignableFrom(AdviceMethodProperties properties)
    {