[jboss-cvs] jboss-seam/src/main/org/jboss/seam/intercept ...

[Gavin King]

  User: gavin   
  Date: 06/10/10 14:12:31

  Modified:    src/main/org/jboss/seam/intercept     
                        ClientSideInterceptor.java JavaBeanInterceptor.java
                        SessionBeanInterceptor.java
  Added:       src/main/org/jboss/seam/intercept     
                        RootInvocationContext.java
  Removed:     src/main/org/jboss/seam/intercept     
                        JavaBeanInvocationContext.java
  Log:
  minor
  
  Revision  Changes    Path
  1.2       +3 -2      jboss-seam/src/main/org/jboss/seam/intercept/ClientSideInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ClientSideInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/intercept/ClientSideInterceptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ClientSideInterceptor.java	10 Oct 2006 06:43:16 -0000	1.1
  +++ ClientSideInterceptor.java	10 Oct 2006 18:12:31 -0000	1.2
  @@ -1,4 +1,4 @@
  -//$Id: ClientSideInterceptor.java,v 1.1 2006/10/10 06:43:16 gavin Exp $
  +//$Id: ClientSideInterceptor.java,v 1.2 2006/10/10 18:12:31 gavin Exp $
   package org.jboss.seam.intercept;
   
   import java.io.Serializable;
  @@ -34,7 +34,8 @@
      public Object intercept(final Object proxy, final Method method, final Object[] params,
            final MethodProxy methodProxy) throws Throwable
      {
  -      return aroundInvoke( new JavaBeanInvocationContext(bean, method, params)
  +      //TODO: handle the finalize method
  +      return aroundInvoke( new RootInvocationContext(bean, method, params)
         {
            public Object proceed() throws Exception
            {
  
  
  
  1.2       +4 -4      jboss-seam/src/main/org/jboss/seam/intercept/JavaBeanInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JavaBeanInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/intercept/JavaBeanInterceptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- JavaBeanInterceptor.java	10 Oct 2006 06:43:16 -0000	1.1
  +++ JavaBeanInterceptor.java	10 Oct 2006 18:12:31 -0000	1.2
  @@ -1,4 +1,4 @@
  -//$Id: JavaBeanInterceptor.java,v 1.1 2006/10/10 06:43:16 gavin Exp $
  +//$Id: JavaBeanInterceptor.java,v 1.2 2006/10/10 18:12:31 gavin Exp $
   package org.jboss.seam.intercept;
   
   import java.io.Serializable;
  @@ -66,7 +66,7 @@
   
      private void callPrePassivate(final Object target)
      {
  -      prePassivate( new JavaBeanInvocationContext(target, getComponent().getPrePassivateMethod(), new Object[0])
  +      prePassivate( new RootInvocationContext(target, getComponent().getPrePassivateMethod(), new Object[0])
         {
            public Object proceed() throws Exception
            {
  @@ -79,7 +79,7 @@
   
      private void callPostActivate( final Object target)
      {
  -      postActivate( new JavaBeanInvocationContext(target, getComponent().getPostActivateMethod(), new Object[0])
  +      postActivate( new RootInvocationContext(target, getComponent().getPostActivateMethod(), new Object[0])
         {
            public Object proceed() throws Exception
            {
  @@ -93,7 +93,7 @@
      private Object interceptInvocation(final Object target, final Method method, final Object[] params, 
            final MethodProxy methodProxy) throws Exception
      {
  -      return aroundInvoke( new JavaBeanInvocationContext(target, method, params)
  +      return aroundInvoke( new RootInvocationContext(target, method, params)
         {
            
            public Object proceed() throws Exception
  
  
  
  1.2       +0 -1      jboss-seam/src/main/org/jboss/seam/intercept/SessionBeanInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SessionBeanInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/intercept/SessionBeanInterceptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SessionBeanInterceptor.java	10 Oct 2006 06:43:16 -0000	1.1
  +++ SessionBeanInterceptor.java	10 Oct 2006 18:12:31 -0000	1.2
  @@ -63,5 +63,4 @@
         super.postConstruct(invocation);
      }
   
  -   
   }
  
  
  
  1.1      date: 2006/10/10 18:12:31;  author: gavin;  state: Exp;jboss-seam/src/main/org/jboss/seam/intercept/RootInvocationContext.java
  
  Index: RootInvocationContext.java
  ===================================================================
  package org.jboss.seam.intercept;
  
  import java.lang.reflect.Method;
  import java.util.HashMap;
  import java.util.Map;
  
  import javax.interceptor.InvocationContext;
  
  /**
   * InvocationContext for use with CGLIB-based interceptors.
   * 
   * @author Gavin King
   *
   */
  public abstract class RootInvocationContext implements InvocationContext
  {
     private final Object bean;
     private final Method method;
     private Object[] params;
     private final Map contextData = new HashMap();
  
     public RootInvocationContext(Object bean, Method method, Object[] params)
     {
        this.bean = bean;
        this.method = method;
        this.params = params;
     }
     
     public abstract Object proceed() throws Exception;
  
     public Object getTarget()
     {
        return bean;
     }
  
     public Map getContextData()
     {
        return contextData;
     }
  
     public Method getMethod()
     {
        return method;
     }
  
     public Object[] getParameters()
     {
        return params;
     }
  
     public void setParameters(Object[] newParams)
     {
        params = newParams;
     }
  }