[jboss-cvs] JBossCache/src-50/org/jboss/cache/pojo/interceptors/dynamic ...

[Ben Wang]

  User: bwang   
  Date: 06/07/12 09:28:25

  Modified:    src-50/org/jboss/cache/pojo/interceptors/dynamic   
                        AbstractCollectionInterceptor.java
                        BaseInterceptor.java CacheFieldInterceptor.java
  Log:
  Renamed AOPInstance to PojoReference and also some refactoring.
  
  Revision  Changes    Path
  1.2       +7 -7      JBossCache/src-50/org/jboss/cache/pojo/interceptors/dynamic/AbstractCollectionInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractCollectionInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/interceptors/dynamic/AbstractCollectionInterceptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- AbstractCollectionInterceptor.java	7 Jul 2006 10:26:04 -0000	1.1
  +++ AbstractCollectionInterceptor.java	12 Jul 2006 13:28:25 -0000	1.2
  @@ -8,20 +8,20 @@
   package org.jboss.cache.pojo.interceptors.dynamic;
   
   import org.jboss.cache.Fqn;
  -import org.jboss.cache.pojo.AOPInstance;
  +import org.jboss.cache.pojo.PojoReference;
   
   /**
    * Abstract base class for collection interceptor.
    *
    * @author Ben Wang
  - * @version $Id: AbstractCollectionInterceptor.java,v 1.1 2006/07/07 10:26:04 bwang Exp $
  + * @version $Id: AbstractCollectionInterceptor.java,v 1.2 2006/07/12 13:28:25 bwang Exp $
    */
   @SuppressWarnings({"CanBeFinal"})
   public abstract class AbstractCollectionInterceptor implements BaseInterceptor
   {
      Fqn fqn_;
      private boolean attached_ = true;
  -   private AOPInstance aopInstance_;
  +   private PojoReference pojoReference_;
   
      @SuppressWarnings({"CanBeFinal"})
      public Fqn getFqn()
  @@ -36,14 +36,14 @@
      }
   
      @SuppressWarnings({"CanBeFinal"})
  -   public AOPInstance getAopInstance()
  +   public PojoReference getAopInstance()
      {
  -      return aopInstance_;
  +      return pojoReference_;
      }
   
  -   public void setAopInstance(AOPInstance aopInstance)
  +   public void setAopInstance(PojoReference pojoReference)
      {
  -      this.aopInstance_ = aopInstance;
  +      this.pojoReference_ = pojoReference;
      }
   
      /**
  
  
  
  1.2       +3 -3      JBossCache/src-50/org/jboss/cache/pojo/interceptors/dynamic/BaseInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BaseInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/interceptors/dynamic/BaseInterceptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- BaseInterceptor.java	7 Jul 2006 10:26:04 -0000	1.1
  +++ BaseInterceptor.java	12 Jul 2006 13:28:25 -0000	1.2
  @@ -7,7 +7,7 @@
   package org.jboss.cache.pojo.interceptors.dynamic;
   
   import org.jboss.cache.Fqn;
  -import org.jboss.cache.pojo.AOPInstance;
  +import org.jboss.cache.pojo.PojoReference;
   import org.jboss.aop.advice.Interceptor;
   
   
  @@ -27,9 +27,9 @@
   
      void setFqn(Fqn fqn);
   
  -   AOPInstance getAopInstance();
  +   PojoReference getAopInstance();
   
  -   void setAopInstance(AOPInstance aopInstance);
  +   void setAopInstance(PojoReference pojoReference);
   
      void setInterceptor(Interceptor interceptor);
   }
  
  
  
  1.3       +8 -8      JBossCache/src-50/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheFieldInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- CacheFieldInterceptor.java	10 Jul 2006 02:30:31 -0000	1.2
  +++ CacheFieldInterceptor.java	12 Jul 2006 13:28:25 -0000	1.3
  @@ -22,7 +22,7 @@
   import org.jboss.cache.pojo.util.AopUtil;
   import org.jboss.cache.pojo.PojoTreeCache;
   import org.jboss.cache.pojo.CachedType;
  -import org.jboss.cache.pojo.AOPInstance;
  +import org.jboss.cache.pojo.PojoReference;
   import org.jboss.cache.pojo.InternalDelegate;
   
   import java.lang.reflect.Field;
  @@ -41,7 +41,7 @@
      private CachedType type;
      private Fqn fqn;
      private String name;
  -   private AOPInstance aopInstance;
  +   private PojoReference pojoReference;
   
      public CacheFieldInterceptor(PojoTreeCache cache, Fqn fqn, CachedType type)
      {
  @@ -54,9 +54,9 @@
      {
      }
   
  -   public AOPInstance getAopInstance()
  +   public PojoReference getAopInstance()
      {
  -      return aopInstance;
  +      return pojoReference;
      }
   
      public Object clone()
  @@ -74,9 +74,9 @@
         setAopInstance(interceptor.getAopInstance());
      }
   
  -   public void setAopInstance(AOPInstance aopInstance)
  +   public void setAopInstance(PojoReference pojoReference)
      {
  -      this.aopInstance = aopInstance;
  +      this.pojoReference = pojoReference;
      }
   
      public String getName()
  @@ -234,9 +234,9 @@
   
      protected void checkCacheConsistency() throws Exception
      {
  -      if (this != cache.peek(fqn, AOPInstance.KEY))
  +      if (this != cache.peek(fqn, PojoReference.KEY))
         {
  -         throw new RuntimeException("Cache inconsistency: Outdated AOPInstance");
  +         throw new RuntimeException("Cache inconsistency: Outdated PojoReference");
         }
      }