[jboss-cvs] JBossAS SVN: r62813 - 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-05-04 13:11:57 -0400 (Fri, 04 May 2007)
New Revision: 62813

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AdviceMethodFactory.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/ParameterAnnotationRule.java
Log:
[JBAOP-381] Reordering Return and Thrown

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AdviceMethodFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AdviceMethodFactory.java	2007-05-04 14:44:34 UTC (rev 62812)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AdviceMethodFactory.java	2007-05-04 17:11:57 UTC (rev 62813)
@@ -74,8 +74,8 @@
     */
    public static final AdviceMethodFactory FINALLY = new AdviceMethodFactory (null,
          new ParameterAnnotationRule[]{ParameterAnnotationRule.JOIN_POINT,
-         ParameterAnnotationRule.OPTIONAL_THROWN, ParameterAnnotationRule.RETURN},
-         ReturnType.ANY, new int[][]{{2, 1}});
+         ParameterAnnotationRule.RETURN, ParameterAnnotationRule.OPTIONAL_THROWN},
+         ReturnType.ANY, new int[][]{{1, 2}});
    /**
     * Factory that selects advice methods for <i>aroung</i> interception.
     */

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-05-04 14:44:34 UTC (rev 62812)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/ParameterAnnotationRule.java	2007-05-04 17:11:57 UTC (rev 62813)
@@ -74,6 +74,18 @@
    },
    
    /**
+    * Rule for parameter annotation {@link Return}.
+    */
+   RETURN (
+         Return.class, null, AdviceMethodProperties.RETURN_ARG, 50, false, true)
+   {
+      public Object getAssignableFrom(AdviceMethodProperties properties)
+      {
+         return properties.getJoinpointReturnType();
+      }
+   },
+   
+   /**
     * Rule for parameter annotation {@link Thrown}.
     */
    OPTIONAL_THROWN (
@@ -86,18 +98,6 @@
    MANDATORY_THROWN (
          Thrown.class, Throwable.class, AdviceMethodProperties.THROWABLE_ARG, 50,
          true, true),
-         
-   /**
-    * Rule for parameter annotation {@link Return}.
-    */
-   RETURN (
-         Return.class, null, AdviceMethodProperties.RETURN_ARG, 50, false, true)
-   {
-      public Object getAssignableFrom(AdviceMethodProperties properties)
-      {
-         return properties.getJoinpointReturnType();
-      }
-   },
       
    /**
     * Rule for parameter annotation {@link Arg}.