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

[Ben Wang]

  User: bwang   
  Date: 06/07/31 01:13:21

  Modified:    src-50/org/jboss/cache/pojo/impl  PojoCacheImpl.java
  Log:
  JBCACHE-702 user-specified region to perpend the id namespace.
  
  Revision  Changes    Path
  1.17      +6 -12     JBossCache/src-50/org/jboss/cache/pojo/impl/PojoCacheImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PojoCacheImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/impl/PojoCacheImpl.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- PojoCacheImpl.java	31 Jul 2006 02:44:42 -0000	1.16
  +++ PojoCacheImpl.java	31 Jul 2006 05:13:21 -0000	1.17
  @@ -20,6 +20,7 @@
   import org.jboss.cache.pojo.PojoCacheException;
   import org.jboss.cache.pojo.PojoCacheListener;
   import org.jboss.cache.pojo.PojoTreeCache;
  +import org.jboss.cache.pojo.util.AopUtil;
   import org.jboss.cache.pojo.annotation.Attach;
   import org.jboss.cache.pojo.annotation.Detach;
   import org.jboss.cache.pojo.annotation.Find;
  @@ -40,7 +41,7 @@
    * Implementation class for PojoCache interface
    *
    * @author Ben Wang
  - * @version $Id: PojoCacheImpl.java,v 1.16 2006/07/31 02:44:42 bwang Exp $
  + * @version $Id: PojoCacheImpl.java,v 1.17 2006/07/31 05:13:21 bwang Exp $
    */
   public class PojoCacheImpl implements PojoCache, Observer
   {
  @@ -88,7 +89,7 @@
   
      public Object attach(String id, Object pojo) throws PojoCacheException
      {
  -      return attach(Fqn.fromString(id), pojo);
  +      return attach(AopUtil.getIdWithRegion(id), pojo);
      }
   
      @Attach
  @@ -125,7 +126,7 @@
   
      public Object detach(String id) throws PojoCacheException
      {
  -      return detach(Fqn.fromString(id));
  +      return detach(AopUtil.getIdWithRegion(id));
      }
   
      @Detach
  @@ -160,7 +161,7 @@
   
      public Object find(String id) throws PojoCacheException
      {
  -      return find(Fqn.fromString(id));
  +      return find(AopUtil.getIdWithRegion(id));
      }
   
      @Find
  @@ -184,7 +185,7 @@
   
      public Map findAll(String id) throws PojoCacheException
      {
  -      return findAll(Fqn.fromString(id));
  +      return findAll(AopUtil.getIdWithRegion(id));
      }
   
      @Find
  @@ -254,12 +255,6 @@
         return cache_;
      }
   
  -
  -   public Object XputObject(Fqn fqn, Object obj) throws CacheException
  -   {
  -      return delegate_.putObjectII(fqn, obj);
  -   }
  -
      /**
       * Used by internal implementation. Not for general public.
       */
  @@ -301,7 +296,6 @@
      /********************************************************************************
       * Internal API for event notification
       ********************************************************************************/
  -
      /**
       * Callback for Observable to notify of field modification
       * @param subject