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 2005/01/16 13:03:36 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker/util/sequence SequenceManagerHelper.java
brj 2005/01/16 04:03:36
Modified: src/java/org/apache/ojb/broker/core
PersistenceBrokerImpl.java
src/java/org/apache/ojb/broker/metadata ClassDescriptor.java
ObjectReferenceDescriptor.java
DescriptorRepository.java
src/java/org/apache/ojb/broker/util BrokerHelper.java
src/java/org/apache/ojb/broker/util/sequence
SequenceManagerHelper.java
Log:
ClassDescriptor#isInterface is deprecated
Revision Changes Path
1.110 +4 -4 db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java
Index: PersistenceBrokerImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- PersistenceBrokerImpl.java 14 Jan 2005 01:43:27 -0000 1.109
+++ PersistenceBrokerImpl.java 16 Jan 2005 12:03:34 -0000 1.110
@@ -686,7 +686,7 @@
query = referencesBroker.getPKQuery((Identity) oid);
}
- if (!cld.isInterface())
+ if (cld.isMappedToTable())
{
getBatchManager().executeDelete(query, cld);
}
@@ -1450,8 +1450,8 @@
ClassDescriptor cld = getClassDescriptor(c);
Object newObj = null;
- // Class is NOT an Interface: it has a directly mapped table and we lookup this table first:
- if (!cld.isInterface())
+ // Class has a directly mapped table and we lookup this table first:
+ if (cld.isMappedToTable())
{
// 1. try to retrieve skalar fields from directly mapped table columns
newObj = getBatchManager().materializeObject(cld, oid);
1.99 +4 -7 db-ojb/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java
Index: ClassDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- ClassDescriptor.java 9 Jan 2005 10:12:56 -0000 1.98
+++ ClassDescriptor.java 16 Jan 2005 12:03:35 -0000 1.99
@@ -19,12 +19,10 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -34,9 +32,7 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
import org.apache.ojb.broker.PersistenceBrokerException;
-import org.apache.ojb.broker.core.ValueContainer;
import org.apache.ojb.broker.core.proxy.ProxyHelper;
-import org.apache.ojb.broker.metadata.fieldaccess.PersistentField;
import org.apache.ojb.broker.util.ClassHelper;
import org.apache.ojb.broker.util.SqlHelper;
import org.apache.ojb.broker.util.logging.LoggerFactory;
@@ -1251,6 +1247,7 @@
/**
* Return true, if the described class is
* an 'interface'. That is if the class is <b>not</b> mapped to a table.
+ * @deprecated use ! isMappedToTable()
* @see #isMappedToTable()
*/
public boolean isInterface()
@@ -1803,7 +1800,7 @@
.append("classNameOfObject", getClassNameOfObject())
.append("tableName", getTableName())
.append("schema", getSchema())
- .append("isInterface", isInterface())
+ .append("isMappedToTable", isMappedToTable())
.append("extendClassNames", getExtentClassNames().toString())
.append("special ObjectCache", objectCacheDescriptor)
.append(getFieldDescriptions())
@@ -1961,7 +1958,7 @@
}
// begin of elements
- if (isInterface())
+ if (!isMappedToTable())
{
// extent-class
for (int i = 0; i < getExtentClassNames().size(); i++)
1.45 +2 -2 db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectReferenceDescriptor.java
Index: ObjectReferenceDescriptor.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectReferenceDescriptor.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ObjectReferenceDescriptor.java 13 Jan 2005 17:29:52 -0000 1.44
+++ ObjectReferenceDescriptor.java 16 Jan 2005 12:03:35 -0000 1.45
@@ -115,7 +115,7 @@
// In a many-to-many relationship Fk-Fields vector will be null.
if (fkFields != null)
{
- if (cld.isInterface())
+ if (!cld.isMappedToTable())
{
//exchange interface class descriptor with first concrete class
Vector extents = cld.getExtentClasses();
@@ -173,7 +173,7 @@
// In a many-to-many relationship Fk-Fields vector will be null.
if (fkFields != null)
{
- if (targetCld.isInterface())
+ if (!targetCld.isMappedToTable())
{
//exchange interface class descriptor with first concrete class
Vector extents = targetCld.getExtentClasses();
1.60 +4 -4 db-ojb/src/java/org/apache/ojb/broker/metadata/DescriptorRepository.java
Index: DescriptorRepository.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/DescriptorRepository.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- DescriptorRepository.java 23 Dec 2004 22:22:00 -0000 1.59
+++ DescriptorRepository.java 16 Jan 2005 12:03:35 -0000 1.60
@@ -294,7 +294,7 @@
ClassDescriptor result = (ClassDescriptor) m_firstConcreteClassMap.get(cld.getClassNameOfObject());
if (result == null)
{
- if(cld.isInterface() || cld.isAbstract())
+ if(!cld.isMappedToTable() || cld.isAbstract())
{
if(cld.isExtent())
{
@@ -350,7 +350,7 @@
// prevent infinite recursion caused by cyclic references
continue;
}
- if (!extCld.isInterface() && !extCld.isAbstract())
+ if (extCld.isMappedToTable() && !extCld.isAbstract())
{
concreteSubclassClds.add(extCld);
}
@@ -418,7 +418,7 @@
{
Collection clds = new ArrayList();
- if (!aCld.isInterface())
+ if (aCld.isMappedToTable())
{
clds.add(aCld);
}
1.77 +2 -2 db-ojb/src/java/org/apache/ojb/broker/util/BrokerHelper.java
Index: BrokerHelper.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/BrokerHelper.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- BrokerHelper.java 9 Jan 2005 10:12:56 -0000 1.76
+++ BrokerHelper.java 16 Jan 2005 12:03:36 -0000 1.77
@@ -1013,7 +1013,7 @@
Collection extentClds = m_broker.getDescriptorRepository().getAllConcreteSubclassDescriptors(aCld);
Collection allClds = new ArrayList(1 + extentClds.size());
- if (!aCld.isInterface())
+ if (aCld.isMappedToTable())
{
allClds.add(aCld);
}
1.21 +4 -4 db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerHelper.java
Index: SequenceManagerHelper.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerHelper.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SequenceManagerHelper.java 25 Nov 2004 20:30:24 -0000 1.20
+++ SequenceManagerHelper.java 16 Jan 2005 12:03:36 -0000 1.21
@@ -188,7 +188,7 @@
private static String firstFoundTableName(PersistenceBroker brokerForClass, ClassDescriptor cld)
{
String name = null;
- if (!cld.isInterface() && cld.getFullTableName() != null)
+ if (cld.isMappedToTable() && cld.getFullTableName() != null)
{
return cld.getFullTableName();
}
@@ -236,8 +236,8 @@
long tmp = 0;
ClassDescriptor cld = brokerForClass.getClassDescriptor(topLevel);
- // if class is not an interface / not abstract we have to search its directly mapped table
- if (!cld.isInterface() && !cld.isAbstract())
+ // if class is mapped / not abstract we have to search its directly mapped table
+ if (cld.isMappedToTable() && !cld.isAbstract())
{
tmp = getMaxIdForClass(brokerForClass, cld, original);
if (tmp > max)
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org