brj 2005/01/16 04:05:29
Modified: src/test/org/apache/ojb/broker/metadata MetadataTest.java
src/java/org/apache/ojb/odmg ObjectEnvelopeTable.java
Log:
ClassDescriptor#isInterface is deprecated
Revision Changes Path
1.23 +1 -1
db-ojb/src/test/org/apache/ojb/broker/metadata/MetadataTest.java
Index: MetadataTest.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/test/org/apache/ojb/broker/metadata/MetadataTest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- MetadataTest.java 5 Dec 2004 19:55:11 -0000 1.22
+++ MetadataTest.java 16 Jan 2005 12:05:29 -0000 1.23
@@ -67,7 +67,7 @@
DescriptorRepository dr = ojb.getMetadataManager().getRepository();
ClassDescriptor cld =
dr.getDescriptorFor(Repository.SMInterface.class);
ClassDescriptor firstConcrete = dr.findFirstConcreteClass(cld);
- assertFalse(firstConcrete.isInterface());
+ assertTrue(firstConcrete.isMappedToTable());
assertFalse(firstConcrete.isAbstract());
firstConcrete = dr.findFirstConcreteClass(cld);
firstConcrete = dr.findFirstConcreteClass(cld);
1.42 +1 -1
db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java
Index: ObjectEnvelopeTable.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ObjectEnvelopeTable.java 5 Dec 2004 12:31:01 -0000 1.41
+++ ObjectEnvelopeTable.java 16 Jan 2005 12:05:29 -0000 1.42
@@ -331,7 +331,7 @@
{
//if itemCld refers to an interface the
foreignKeyFieldDescriptors
//have to be computed again for each concrete class
- if (itemCld.isInterface())
+ if (!itemCld.isMappedToTable())
{
ClassDescriptor concreteItemCld =
broker.getClassDescriptor(item.getClass());
itemFkFields =
cds.getForeignKeyFieldDescriptors(concreteItemCld);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
