db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/broker/accesslayer RsIterator.java
Date Wed, 13 Apr 2005 20:04:55 GMT
brj         2005/04/13 13:04:55

  Modified:    src/java/org/apache/ojb/broker/cache
                        CacheStrategyDefaultImpl.java
                        CacheStrategyEmptyImpl.java
                        CacheStrategyAbstractImpl.java CacheStrategy.java
                        LocalCache.java
               src/java/org/apache/ojb/broker/accesslayer RsIterator.java
  Log:
  use PBInternal instead of PBImpl
  
  Revision  Changes    Path
  1.2       +5 -5      db-ojb/src/java/org/apache/ojb/broker/cache/CacheStrategyDefaultImpl.java
  
  Index: CacheStrategyDefaultImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/cache/CacheStrategyDefaultImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CacheStrategyDefaultImpl.java	11 Aug 2004 00:42:56 -0000	1.1
  +++ CacheStrategyDefaultImpl.java	13 Apr 2005 20:04:55 -0000	1.2
  @@ -3,7 +3,7 @@
   import java.util.Properties;
   
   import org.apache.ojb.broker.Identity;
  -import org.apache.ojb.broker.core.PersistenceBrokerImpl;
  +import org.apache.ojb.broker.PersistenceBrokerInternal;
   import org.apache.ojb.broker.metadata.ClassDescriptor;
   
   /* Copyright 2002-2004 The Apache Software Foundation
  @@ -66,12 +66,12 @@
           this.sb = new SnapshotBuilder();
       }
   
  -    public void doRemove(PersistenceBrokerImpl broker, Identity oid)
  +    public void doRemove(PersistenceBrokerInternal broker, Identity oid)
       {
           realCache.remove(oid);
       }
   
  -    public void doCache(PersistenceBrokerImpl broker, Identity oid, Object obj)
  +    public void doCache(PersistenceBrokerInternal broker, Identity oid, Object obj)
       {
           if(useTwoLevel)
           {
  @@ -82,7 +82,7 @@
           realCache.cache(oid, obj);
       }
   
  -    public Object lookup(PersistenceBrokerImpl broker, Identity oid)
  +    public Object lookup(PersistenceBrokerInternal broker, Identity oid)
       {
           Object result = null;
           result = realCache.lookup(oid);
  
  
  
  1.2       +5 -5      db-ojb/src/java/org/apache/ojb/broker/cache/CacheStrategyEmptyImpl.java
  
  Index: CacheStrategyEmptyImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/cache/CacheStrategyEmptyImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CacheStrategyEmptyImpl.java	11 Aug 2004 00:42:56 -0000	1.1
  +++ CacheStrategyEmptyImpl.java	13 Apr 2005 20:04:55 -0000	1.2
  @@ -3,7 +3,7 @@
   import java.util.Properties;
   
   import org.apache.ojb.broker.Identity;
  -import org.apache.ojb.broker.core.PersistenceBrokerImpl;
  +import org.apache.ojb.broker.PersistenceBrokerInternal;
   
   /* Copyright 2002-2004 The Apache Software Foundation
    *
  @@ -32,15 +32,15 @@
       {
       }
   
  -    public void doRemove(PersistenceBrokerImpl broker, Identity oid)
  +    public void doRemove(PersistenceBrokerInternal broker, Identity oid)
       {
       }
   
  -    public void doCache(PersistenceBrokerImpl broker, Identity oid, Object obj)
  +    public void doCache(PersistenceBrokerInternal broker, Identity oid, Object obj)
       {
       }
   
  -    public Object lookup(PersistenceBrokerImpl broker, Identity oid)
  +    public Object lookup(PersistenceBrokerInternal broker, Identity oid)
       {
           return null;
       }
  
  
  
  1.2       +8 -8      db-ojb/src/java/org/apache/ojb/broker/cache/CacheStrategyAbstractImpl.java
  
  Index: CacheStrategyAbstractImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/cache/CacheStrategyAbstractImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CacheStrategyAbstractImpl.java	11 Aug 2004 00:42:56 -0000	1.1
  +++ CacheStrategyAbstractImpl.java	13 Apr 2005 20:04:55 -0000	1.2
  @@ -4,7 +4,7 @@
   import java.util.Map;
   
   import org.apache.ojb.broker.Identity;
  -import org.apache.ojb.broker.core.PersistenceBrokerImpl;
  +import org.apache.ojb.broker.PersistenceBrokerInternal;
   import org.apache.ojb.broker.util.ReferenceMap;
   
   /* Copyright 2002-2004 The Apache Software Foundation
  @@ -46,17 +46,17 @@
        * @param oid   The {@link org.apache.ojb.broker.Identity} of the object to cache.
        * @param obj The object to cache.
        */
  -    public abstract void doCache(PersistenceBrokerImpl broker, Identity oid, Object obj);
  +    public abstract void doCache(PersistenceBrokerInternal broker, Identity oid, Object
obj);
   
       /**
        * Remove object from cache.
        * 
        * @param oid The {@link org.apache.ojb.broker.Identity} of the object to be removed.
        */
  -    public abstract void doRemove(PersistenceBrokerImpl broker, Identity oid);
  +    public abstract void doRemove(PersistenceBrokerInternal broker, Identity oid);
   
       /**
  -     * Delegates method call to {@link #doCache(org.apache.ojb.broker.core.PersistenceBrokerImpl,
org.apache.ojb.broker.Identity, java.lang.Object)}
  +     * Delegates method call to {@link #doCache(org.apache.ojb.broker.core.PersistenceBrokerInternal,
org.apache.ojb.broker.Identity, java.lang.Object)}
        * and handle the added {@link InvalidationListener}.
        * <br/>
        * Note: Be careful when override this method!
  @@ -65,21 +65,21 @@
        * @param obj The object to cache.
        * @see #doCache(org.apache.ojb.broker.core.PersistenceBrokerImpl, org.apache.ojb.broker.Identity,
java.lang.Object)
        */
  -    public void cache(PersistenceBrokerImpl broker, Identity oid, Object obj)
  +    public void cache(PersistenceBrokerInternal broker, Identity oid, Object obj)
       {
           performInvalidationAction(oid);
           doCache(broker, oid, obj);
       }
   
       /**
  -     * Delegates method call to {@link #doRemove(org.apache.ojb.broker.core.PersistenceBrokerImpl,
org.apache.ojb.broker.Identity)}
  +     * Delegates method call to {@link #doRemove(org.apache.ojb.broker.core.PersistenceBrokerInternal,
org.apache.ojb.broker.Identity)}
        * and handle the added {@link InvalidationListener}.
        * <br/>
        * Note: Be careful when override this method.
        *
        * @param oid The {@link org.apache.ojb.broker.Identity} of the object to be removed.
        */
  -    public void remove(PersistenceBrokerImpl broker, Identity oid)
  +    public void remove(PersistenceBrokerInternal broker, Identity oid)
       {
           performInvalidationAction(oid);
           doRemove(broker, oid);
  
  
  
  1.3       +5 -5      db-ojb/src/java/org/apache/ojb/broker/cache/CacheStrategy.java
  
  Index: CacheStrategy.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/cache/CacheStrategy.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CacheStrategy.java	26 Nov 2004 19:42:24 -0000	1.2
  +++ CacheStrategy.java	13 Apr 2005 20:04:55 -0000	1.3
  @@ -1,7 +1,7 @@
   package org.apache.ojb.broker.cache;
   
   import org.apache.ojb.broker.Identity;
  -import org.apache.ojb.broker.core.PersistenceBrokerImpl;
  +import org.apache.ojb.broker.PersistenceBrokerInternal;
   
   /* Copyright 2002-2004 The Apache Software Foundation
    *
  @@ -38,7 +38,7 @@
        * @param oid   The {@link org.apache.ojb.broker.Identity} of the object.
        * @param obj The object to cache.
        */
  -    public void cache(PersistenceBrokerImpl broker, Identity oid, Object obj);
  +    public void cache(PersistenceBrokerInternal broker, Identity oid, Object obj);
   
       /**
        * Lookup an cached object.
  @@ -46,14 +46,14 @@
        * @param oid The {@link org.apache.ojb.broker.Identity} of the wanted object.
        * @return The the cached object or <em>null</em> if no entry was found.
        */
  -    public Object lookup(PersistenceBrokerImpl broker, Identity oid);
  +    public Object lookup(PersistenceBrokerInternal broker, Identity oid);
   
       /**
        * Removes an Object from the cache.
        *
        * @param oid Identity of the object to be removed.
        */
  -    public void remove(PersistenceBrokerImpl broker, Identity oid);
  +    public void remove(PersistenceBrokerInternal broker, Identity oid);
   
       /**
        * Clear the ObjectCache.
  
  
  
  1.5       +5 -5      db-ojb/src/java/org/apache/ojb/broker/cache/LocalCache.java
  
  Index: LocalCache.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/cache/LocalCache.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LocalCache.java	12 Nov 2004 00:15:58 -0000	1.4
  +++ LocalCache.java	13 Apr 2005 20:04:55 -0000	1.5
  @@ -15,13 +15,13 @@
    * limitations under the License.
    */
   
  +import java.util.ArrayList;
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.List;
  -import java.util.ArrayList;
   
   import org.apache.ojb.broker.Identity;
  -import org.apache.ojb.broker.core.PersistenceBrokerImpl;
  +import org.apache.ojb.broker.PersistenceBrokerInternal;
   import org.apache.ojb.broker.util.logging.Logger;
   import org.apache.ojb.broker.util.logging.LoggerFactory;
   
  @@ -70,11 +70,11 @@
       public static final int TYPE_UNKNOWN = 0;
   
       private HashMap localCache;
  -    private PersistenceBrokerImpl broker;
  +    private PersistenceBrokerInternal broker;
       private boolean enabledReadCache;
       private int invokeCounter;
   
  -    public LocalCache(final PersistenceBrokerImpl broker)
  +    public LocalCache(final PersistenceBrokerInternal broker)
       {
           this.broker = broker;
           this.localCache = new HashMap();
  
  
  
  1.74      +1 -2      db-ojb/src/java/org/apache/ojb/broker/accesslayer/RsIterator.java
  
  Index: RsIterator.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/RsIterator.java,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- RsIterator.java	13 Apr 2005 19:48:28 -0000	1.73
  +++ RsIterator.java	13 Apr 2005 20:04:55 -0000	1.74
  @@ -34,7 +34,6 @@
   import org.apache.ojb.broker.PersistenceBrokerInternal;
   import org.apache.ojb.broker.PersistenceBrokerSQLException;
   import org.apache.ojb.broker.cache.LocalCache;
  -import org.apache.ojb.broker.core.PersistenceBrokerImpl;
   import org.apache.ojb.broker.metadata.ClassDescriptor;
   import org.apache.ojb.broker.metadata.DescriptorRepository;
   import org.apache.ojb.broker.metadata.FieldDescriptor;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message