[jboss-cvs] jboss-aspects/src/main/org/jboss/aop/versioned CollectionStateChangeInterceptor.java VersionedObjectForwardingInterceptor.java VersionedObjectInterceptor.java

[Bill B. <pat...@us...>]

  User: patriot1burke
  Date: 04/04/13 06:25:34

  Modified:    src/main/org/jboss/aop/versioned
                        CollectionStateChangeInterceptor.java
                        VersionedObjectForwardingInterceptor.java
                        VersionedObjectInterceptor.java
  Log:
  refactoring of AOP framework in invocation area
  
  Revision  Changes    Path
  1.7       +6 -6      jboss-aspects/src/main/org/jboss/aop/versioned/CollectionStateChangeInterceptor.java
  
  Index: CollectionStateChangeInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aop/versioned/CollectionStateChangeInterceptor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CollectionStateChangeInterceptor.java	29 Feb 2004 06:29:29 -0000	1.6
  +++ CollectionStateChangeInterceptor.java	13 Apr 2004 13:25:34 -0000	1.7
  @@ -19,7 +19,7 @@
   /**
    *
    *  @author <a href="mailto:bi...@jb...">Bill Burke</a>
  - *  @version $Revision: 1.6 $
  + *  @version $Revision: 1.7 $
    */
   public class CollectionStateChangeInterceptor implements org.jboss.aop.advice.Interceptor
   {
  @@ -46,21 +46,21 @@
         if (invocation instanceof MethodInvocation)
         {
            org.jboss.aop.joinpoint.MethodInvocation methodInvocation = (org.jboss.aop.joinpoint.MethodInvocation)invocation;
  -         long methodHash = methodInvocation.methodHash;
  +         long methodHash = methodInvocation.getMethodHash();
            Method managerMethod = manager.isManagerMethod(methodHash);
            if (managerMethod != null)
            {
  -            Object[] args = methodInvocation.arguments;
  +            Object[] args = methodInvocation.getArguments();
               return managerMethod.invoke(manager, args);
            }
  -         Object target = methodInvocation.targetObject;
  -         Method method = methodInvocation.method;
  +         Object target = methodInvocation.getTargetObject();
  +         Method method = methodInvocation.getMethod();
            if (method == null)
            {
               HashMap methodMap = manager.getMethodMap();
               method = (Method)methodMap.get(new Long(methodHash));
            }
  -         return method.invoke(target, methodInvocation.arguments);
  +         return method.invoke(target, methodInvocation.getArguments());
         }
         return invocation.invokeNext();
      }
  
  
  
  1.6       +4 -4      jboss-aspects/src/main/org/jboss/aop/versioned/VersionedObjectForwardingInterceptor.java
  
  Index: VersionedObjectForwardingInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aop/versioned/VersionedObjectForwardingInterceptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- VersionedObjectForwardingInterceptor.java	29 Feb 2004 06:29:29 -0000	1.5
  +++ VersionedObjectForwardingInterceptor.java	13 Apr 2004 13:25:34 -0000	1.6
  @@ -21,7 +21,7 @@
    * Invoke on a target object
    *
    * @author <a href="mailto:bi...@jb...">Bill Burke</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public class VersionedObjectForwardingInterceptor implements org.jboss.aop.advice.Interceptor
   {
  @@ -33,7 +33,7 @@
   
      public Object invoke(org.jboss.aop.joinpoint.Invocation invocation) throws Throwable
      {
  -      Object target = invocation.targetObject;
  +      Object target = invocation.getTargetObject();
         if (target instanceof Advised)
         {
            ClassAdvisor advisor = (ClassAdvisor)((Advised)target)._getAdvisor();
  @@ -47,11 +47,11 @@
            {
               // For non-advised methods, we can only do public method invocations
               org.jboss.aop.joinpoint.MethodInvocation methodInvocation = (org.jboss.aop.joinpoint.MethodInvocation)invocation;
  -            long methodHash = methodInvocation.methodHash;
  +            long methodHash = methodInvocation.getMethodHash();
               String classname = (String)invocation.getMetaData(ClassProxyFactory.PROXY_CLASS, ClassProxyFactory.PROXY_CLASSNAME);
               HashMap methodMap = ClassProxyFactory.getMethodMap(classname);
               Method method = (Method)methodMap.get(new Long(methodHash));
  -            Object[] args = methodInvocation.arguments;
  +            Object[] args = methodInvocation.getArguments();
               try
               {
                  return method.invoke(target, args);
  
  
  
  1.6       +3 -3      jboss-aspects/src/main/org/jboss/aop/versioned/VersionedObjectInterceptor.java
  
  Index: VersionedObjectInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aop/versioned/VersionedObjectInterceptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- VersionedObjectInterceptor.java	29 Feb 2004 06:29:29 -0000	1.5
  +++ VersionedObjectInterceptor.java	13 Apr 2004 13:25:34 -0000	1.6
  @@ -21,7 +21,7 @@
    *  on based on the transaction
    *
    *  @author <a href="mailto:bi...@jb...">Bill Burke</a>
  - *  @version $Revision: 1.5 $
  + *  @version $Revision: 1.6 $
    */
   public class VersionedObjectInterceptor implements org.jboss.aop.advice.Interceptor
   {
  @@ -49,7 +49,7 @@
         Object version = manager.getVersion(tx);
         if (version != null)
         {
  -         invocation.targetObject = version;
  +         invocation.setTargetObject(version);
            return invocation.invokeNext();
         }
   
  @@ -75,7 +75,7 @@
         // Ok, we're in a tx, we're not readonly, there is no previous version, so create another
         
         version = manager.createVersion(tx);
  -      invocation.targetObject = version;
  +      invocation.setTargetObject(version);
         return invocation.invokeNext();
      }