You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by br...@apache.org on 2004/05/12 21:25:54 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker/accesslayer RelationshipPrefetcherImpl.java RelationshipPrefetcherFactory.java MtoNCollectionPrefetcher.java PlainPrefetcher.java BasePrefetcher.java ReferencePrefetcher.java CollectionPrefetcher.java
brj 2004/05/12 12:25:54
Modified: src/java/org/apache/ojb/broker/accesslayer
RelationshipPrefetcherImpl.java
RelationshipPrefetcherFactory.java
MtoNCollectionPrefetcher.java PlainPrefetcher.java
BasePrefetcher.java ReferencePrefetcher.java
CollectionPrefetcher.java
Log:
use PBImpl instead of PB
Revision Changes Path
1.13 +3 -3 db-ojb/src/java/org/apache/ojb/broker/accesslayer/RelationshipPrefetcherImpl.java
Index: RelationshipPrefetcherImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/RelationshipPrefetcherImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RelationshipPrefetcherImpl.java 4 Apr 2004 23:53:31 -0000 1.12
+++ RelationshipPrefetcherImpl.java 12 May 2004 19:25:54 -0000 1.13
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import org.apache.ojb.broker.PersistenceBroker;
+import org.apache.ojb.broker.core.PersistenceBrokerImpl;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
@@ -34,7 +34,7 @@
/**
* Constructor for RelationshipPrefetcherImpl.
*/
- public RelationshipPrefetcherImpl(PersistenceBroker aBroker, ObjectReferenceDescriptor anOrd)
+ public RelationshipPrefetcherImpl(PersistenceBrokerImpl aBroker, ObjectReferenceDescriptor anOrd)
{
super(aBroker, anOrd.getItemClass());
objectReferenceDescriptor = anOrd;
1.6 +4 -4 db-ojb/src/java/org/apache/ojb/broker/accesslayer/RelationshipPrefetcherFactory.java
Index: RelationshipPrefetcherFactory.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/RelationshipPrefetcherFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RelationshipPrefetcherFactory.java 4 Apr 2004 23:53:31 -0000 1.5
+++ RelationshipPrefetcherFactory.java 12 May 2004 19:25:54 -0000 1.6
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-import org.apache.ojb.broker.PersistenceBroker;
import org.apache.ojb.broker.PersistenceBrokerException;
+import org.apache.ojb.broker.core.PersistenceBrokerImpl;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.CollectionDescriptor;
import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
@@ -32,7 +32,7 @@
/**
* create either a CollectionPrefetcher or a ReferencePrefetcher
*/
- public static RelationshipPrefetcher createRelationshipPrefetcher(PersistenceBroker aBroker, ObjectReferenceDescriptor ord)
+ public static RelationshipPrefetcher createRelationshipPrefetcher(PersistenceBrokerImpl aBroker, ObjectReferenceDescriptor ord)
{
if (ord instanceof CollectionDescriptor)
{
@@ -55,7 +55,7 @@
/**
* create either a CollectionPrefetcher or a ReferencePrefetcher
*/
- public static RelationshipPrefetcher createRelationshipPrefetcher(PersistenceBroker aBroker, ClassDescriptor anOwnerCld, String aRelationshipName)
+ public static RelationshipPrefetcher createRelationshipPrefetcher(PersistenceBrokerImpl aBroker, ClassDescriptor anOwnerCld, String aRelationshipName)
{
ObjectReferenceDescriptor ord;
1.11 +4 -3 db-ojb/src/java/org/apache/ojb/broker/accesslayer/MtoNCollectionPrefetcher.java
Index: MtoNCollectionPrefetcher.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/MtoNCollectionPrefetcher.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MtoNCollectionPrefetcher.java 9 Apr 2004 13:22:29 -0000 1.10
+++ MtoNCollectionPrefetcher.java 12 May 2004 19:25:54 -0000 1.11
@@ -26,7 +26,8 @@
import org.apache.ojb.broker.Identity;
import org.apache.ojb.broker.ManageableCollection;
import org.apache.ojb.broker.PersistenceBroker;
-import org.apache.ojb.broker.core.proxy.*;
+import org.apache.ojb.broker.core.PersistenceBrokerImpl;
+import org.apache.ojb.broker.core.proxy.CollectionProxyDefaultImpl;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.CollectionDescriptor;
import org.apache.ojb.broker.metadata.FieldDescriptor;
@@ -51,7 +52,7 @@
* @param aBroker the PersistenceBroker
* @param anOrd the CollectionDescriptor
*/
- public MtoNCollectionPrefetcher(PersistenceBroker aBroker, ObjectReferenceDescriptor anOrd)
+ public MtoNCollectionPrefetcher(PersistenceBrokerImpl aBroker, ObjectReferenceDescriptor anOrd)
{
super(aBroker, anOrd);
}
1.8 +5 -3 db-ojb/src/java/org/apache/ojb/broker/accesslayer/PlainPrefetcher.java
Index: PlainPrefetcher.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/PlainPrefetcher.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PlainPrefetcher.java 9 Apr 2004 13:22:28 -0000 1.7
+++ PlainPrefetcher.java 12 May 2004 19:25:54 -0000 1.8
@@ -25,7 +25,9 @@
import org.apache.ojb.broker.Identity;
import org.apache.ojb.broker.PersistenceBroker;
import org.apache.ojb.broker.cache.ObjectCache;
-import org.apache.ojb.broker.core.proxy.*;
+import org.apache.ojb.broker.core.PersistenceBrokerImpl;
+import org.apache.ojb.broker.core.proxy.IndirectionHandler;
+import org.apache.ojb.broker.core.proxy.ProxyHelper;
import org.apache.ojb.broker.query.Query;
/**
@@ -37,7 +39,7 @@
public class PlainPrefetcher extends BasePrefetcher
{
- public PlainPrefetcher(PersistenceBroker aBroker, Class anItemClass)
+ public PlainPrefetcher(PersistenceBrokerImpl aBroker, Class anItemClass)
{
super(aBroker, anItemClass);
}
1.9 +6 -7 db-ojb/src/java/org/apache/ojb/broker/accesslayer/BasePrefetcher.java
Index: BasePrefetcher.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/BasePrefetcher.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BasePrefetcher.java 6 May 2004 19:45:57 -0000 1.8
+++ BasePrefetcher.java 12 May 2004 19:25:54 -0000 1.9
@@ -20,7 +20,6 @@
import java.util.Iterator;
import org.apache.ojb.broker.Identity;
-import org.apache.ojb.broker.PersistenceBroker;
import org.apache.ojb.broker.PersistenceBrokerFactory;
import org.apache.ojb.broker.core.PersistenceBrokerConfiguration;
import org.apache.ojb.broker.core.PersistenceBrokerImpl;
@@ -43,7 +42,7 @@
public abstract class BasePrefetcher implements RelationshipPrefetcher
{
private Logger logger;
- private PersistenceBroker broker;
+ private PersistenceBrokerImpl broker;
protected ClassDescriptor itemClassDesc;
protected final int pkLimit; // max number of pk's in one query
@@ -68,7 +67,7 @@
/**
* Constructor for BasePrefetcher.
*/
- public BasePrefetcher(PersistenceBroker aBroker, Class anItemClass)
+ public BasePrefetcher(PersistenceBrokerImpl aBroker, Class anItemClass)
{
super();
broker = aBroker;
@@ -111,7 +110,7 @@
// BRJ: performRetrieval of childrens references BEFORE associating with owners
// TODO: this is a quick fix !
- ((PersistenceBrokerImpl)getBroker()).getReferenceBroker().performRetrievalTasks();
+ getBroker().getReferenceBroker().performRetrievalTasks();
associateBatched(owners, children);
}
@@ -245,9 +244,9 @@
/**
* Returns the broker.
- * @return PersistenceBroker
+ * @return PersistenceBrokerImpl
*/
- protected PersistenceBroker getBroker()
+ protected PersistenceBrokerImpl getBroker()
{
return broker;
}
1.19 +4 -3 db-ojb/src/java/org/apache/ojb/broker/accesslayer/ReferencePrefetcher.java
Index: ReferencePrefetcher.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/ReferencePrefetcher.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ReferencePrefetcher.java 4 Apr 2004 23:53:31 -0000 1.18
+++ ReferencePrefetcher.java 12 May 2004 19:25:54 -0000 1.19
@@ -17,13 +17,14 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import org.apache.ojb.broker.Identity;
import org.apache.ojb.broker.PersistenceBroker;
import org.apache.ojb.broker.cache.ObjectCache;
+import org.apache.ojb.broker.core.PersistenceBrokerImpl;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
import org.apache.ojb.broker.metadata.fieldaccess.PersistentField;
@@ -43,7 +44,7 @@
* @param aBroker
* @param anOrd
*/
- public ReferencePrefetcher(PersistenceBroker aBroker, ObjectReferenceDescriptor anOrd)
+ public ReferencePrefetcher(PersistenceBrokerImpl aBroker, ObjectReferenceDescriptor anOrd)
{
super(aBroker, anOrd);
}
1.28 +4 -3 db-ojb/src/java/org/apache/ojb/broker/accesslayer/CollectionPrefetcher.java
Index: CollectionPrefetcher.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/CollectionPrefetcher.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- CollectionPrefetcher.java 9 Apr 2004 13:22:29 -0000 1.27
+++ CollectionPrefetcher.java 12 May 2004 19:25:54 -0000 1.28
@@ -27,7 +27,8 @@
import org.apache.ojb.broker.ManageableCollection;
import org.apache.ojb.broker.OJBRuntimeException;
import org.apache.ojb.broker.PersistenceBroker;
-import org.apache.ojb.broker.core.proxy.*;
+import org.apache.ojb.broker.core.PersistenceBrokerImpl;
+import org.apache.ojb.broker.core.proxy.CollectionProxyDefaultImpl;
import org.apache.ojb.broker.core.proxy.ProxyHelper;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.CollectionDescriptor;
@@ -54,7 +55,7 @@
* @param aBroker
* @param anOrd
*/
- public CollectionPrefetcher(PersistenceBroker aBroker, ObjectReferenceDescriptor anOrd)
+ public CollectionPrefetcher(PersistenceBrokerImpl aBroker, ObjectReferenceDescriptor anOrd)
{
super(aBroker, anOrd);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org