[jboss-cvs] JBossCache/src/org/jboss/cache/aop ...

[Ben W. <bw...@jb...>]

  User: bwang   
  Date: 05/07/31 14:07:34

  Modified:    src/org/jboss/cache/aop          AopUtil.java
                        TreeCacheAopDelegate.java
  Removed:     src/org/jboss/cache/aop         
                        AbstractCollectionInterceptor.java CachedList.java
                        CachedListInterceptor.java CachedMap.java
                        CachedMapInterceptor.java CachedSetInterceptor.java
                        CollectionInterceptorUtil.java
  Log:
  Moved Collection to package collection
  
  Revision  Changes    Path
  1.4       +3 -3      JBossCache/src/org/jboss/cache/aop/AopUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AopUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/AopUtil.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- AopUtil.java	27 Jul 2005 18:29:38 -0000	1.3
  +++ AopUtil.java	31 Jul 2005 18:07:34 -0000	1.4
  @@ -39,7 +39,7 @@
       * @param fqn
       * @return
       */
  -   static Interceptor findCacheInterceptor(InstanceAdvisor advisor, Fqn fqn)
  +   static public Interceptor findCacheInterceptor(InstanceAdvisor advisor, Fqn fqn)
      {
         org.jboss.aop.advice.Interceptor[] interceptors = advisor.getInterceptors();
         // Step Check for cross references
  @@ -63,7 +63,7 @@
       * @param advisor
       * @return
       */
  -   static Interceptor findCacheInterceptor(InstanceAdvisor advisor)
  +   static public Interceptor findCacheInterceptor(InstanceAdvisor advisor)
      {
         // TODO we assume there is only one interceptor now.
         Interceptor[] interceptors = advisor.getInterceptors();
  @@ -84,7 +84,7 @@
       * @param advisor
       * @return
       */
  -   static Interceptor findCollectionInterceptor(InstanceAdvisor advisor)
  +   static public Interceptor findCollectionInterceptor(InstanceAdvisor advisor)
      {
         // TODO we assume there is only one interceptor now.
         Interceptor[] interceptors = advisor.getInterceptors();
  
  
  
  1.21      +8 -6      JBossCache/src/org/jboss/cache/aop/TreeCacheAopDelegate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCacheAopDelegate.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/TreeCacheAopDelegate.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- TreeCacheAopDelegate.java	28 Jul 2005 23:04:07 -0000	1.20
  +++ TreeCacheAopDelegate.java	31 Jul 2005 18:07:34 -0000	1.21
  @@ -13,6 +13,8 @@
   import org.jboss.aop.proxy.ClassProxy;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.CacheException;
  +import org.jboss.cache.aop.collection.CollectionInterceptorUtil;
  +import org.jboss.cache.aop.collection.AbstractCollectionInterceptor;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   
  @@ -93,11 +95,11 @@
         } else { // Must be Collection classes. We will use aop.ClassProxy instance instead.
            try {
               if(Map.class.isAssignableFrom(clazz)) {
  -               obj=CollectionInterceptorUtil.createProxy(clazz, new CachedMapInterceptor(cache_, fqn, clazz));
  +               obj=CollectionInterceptorUtil.createMapProxy(cache_, fqn, clazz);
               } else if(List.class.isAssignableFrom(clazz)) {
  -               obj=CollectionInterceptorUtil.createProxy(clazz, new CachedListInterceptor(cache_, fqn, clazz));
  +               obj=CollectionInterceptorUtil.createListProxy(cache_, fqn, clazz);
               } else if(Set.class.isAssignableFrom(clazz)) {
  -               obj=CollectionInterceptorUtil.createProxy(clazz, new CachedSetInterceptor(cache_, fqn, clazz));
  +               obj=CollectionInterceptorUtil.createSetProxy(cache_, fqn, clazz);
               } else {
                  // Maybe it is just a serialized object.
                  obj=cache_.peek(fqn, InternalDelegate.SERIALIZED);
  @@ -305,7 +307,7 @@
            if( !(obj instanceof ClassProxy)) {
               Class clazz = obj.getClass();
               try {
  -               obj=CollectionInterceptorUtil.createProxy(clazz, new CachedMapInterceptor(cache_, fqn, clazz));
  +               obj=CollectionInterceptorUtil.createMapProxy(cache_, fqn, clazz);
               } catch (Exception e) {
                  throw new CacheException("failure creating proxy", e);
               }
  @@ -333,7 +335,7 @@
            if( !(obj instanceof ClassProxy)) {
               Class clazz = obj.getClass();
               try {
  -               obj=CollectionInterceptorUtil.createProxy(clazz, new CachedListInterceptor(cache_, fqn, clazz));
  +               obj=CollectionInterceptorUtil.createListProxy(cache_, fqn, clazz);
               } catch (Exception e) {
                  throw new CacheException("failure creating proxy", e);
               }
  @@ -362,7 +364,7 @@
            if( !(obj instanceof ClassProxy)) {
               Class clazz = obj.getClass();
               try {
  -               obj=CollectionInterceptorUtil.createProxy(clazz, new CachedSetInterceptor(cache_, fqn, clazz));
  +               obj=CollectionInterceptorUtil.createSetProxy(cache_, fqn, clazz);
               } catch (Exception e) {
                  throw new CacheException("failure creating proxy", e);
               }