Return-Path: Delivered-To: apmail-db-ojb-dev-archive@www.apache.org Received: (qmail 58791 invoked from network); 27 Jan 2005 00:07:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 27 Jan 2005 00:07:20 -0000 Received: (qmail 39799 invoked by uid 500); 27 Jan 2005 00:07:20 -0000 Delivered-To: apmail-db-ojb-dev-archive@db.apache.org Received: (qmail 39597 invoked by uid 500); 27 Jan 2005 00:07:19 -0000 Mailing-List: contact ojb-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "OJB Developers List" Reply-To: "OJB Developers List" Delivered-To: mailing list ojb-dev@db.apache.org Received: (qmail 39584 invoked by uid 500); 27 Jan 2005 00:07:19 -0000 Received: (qmail 39579 invoked by uid 99); 27 Jan 2005 00:07:19 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 26 Jan 2005 16:07:19 -0800 Received: (qmail 58759 invoked by uid 1510); 27 Jan 2005 00:07:18 -0000 Date: 27 Jan 2005 00:07:18 -0000 Message-ID: <20050127000718.58758.qmail@minotaur.apache.org> From: arminw@apache.org To: db-ojb-cvs@apache.org Subject: cvs commit: db-ojb/src/java/org/apache/ojb/broker/util BrokerHelper.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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: ojb-dev-unsubscribe@db.apache.org For additional commands, e-mail: ojb-dev-help@db.apache.org