arminw 2005/01/26 16:07:18
Modified: src/java/org/apache/ojb/broker/util Tag: OJB_1_0_RELEASE
BrokerHelper.java
Log:
minor refactoring
Revision Changes Path
No revision
No revision
1.57.2.6 +7 -7
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.57.2.5
retrieving revision 1.57.2.6
diff -u -r1.57.2.5 -r1.57.2.6
--- BrokerHelper.java 13 Dec 2004 19:54:06 -0000 1.57.2.5
+++ BrokerHelper.java 27 Jan 2005 00:07:17 -0000 1.57.2.6
@@ -309,7 +309,7 @@
* @return the autoincremented value set on given object
* @throws PersistenceBrokerException if there is an erros accessing obj
field values
*/
- private Object setAutoIncrementValue(FieldDescriptor fd, Object obj,
Object cv)
+ private Object setAutoIncrementValue(FieldDescriptor fd, Object obj)
{
PersistentField f = fd.getPersistentField();
try
@@ -362,7 +362,7 @@
sql type so that the entire result array contains
objects that are properly typed for sql.
*/
- cv = setAutoIncrementValue(fd, obj, cv);
+ cv = setAutoIncrementValue(fd, obj);
}
if(convertToSql)
{
@@ -733,7 +733,7 @@
while (descriptors.hasNext())
{
CollectionDescriptor cod = (CollectionDescriptor)
descriptors.next();
- linkOrUnlinkOneToMany(doLink, obj, cod, insert);
+ linkOrUnlinkXToMany(doLink, obj, cod, insert);
}
}
}
@@ -813,7 +813,7 @@
CollectionDescriptor cod =
cld.getCollectionDescriptorByName(attributeName);
if (cod != null)
{
- linkOrUnlinkOneToMany(doLink, obj, cod, insert);
+ linkOrUnlinkXToMany(doLink, obj, cod, insert);
match = true;
}
}
@@ -825,7 +825,7 @@
{
if (ord instanceof CollectionDescriptor)
{
- linkOrUnlinkOneToMany(doLink, obj, (CollectionDescriptor) ord,
insert);
+ linkOrUnlinkXToMany(doLink, obj, (CollectionDescriptor) ord,
insert);
}
else
{
@@ -833,7 +833,7 @@
}
}
- private void linkOrUnlinkOneToMany(boolean doLink, Object obj,
CollectionDescriptor cod, boolean insert)
+ private void linkOrUnlinkXToMany(boolean doLink, Object obj,
CollectionDescriptor cod, boolean insert)
{
if (doLink)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
