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 th...@apache.org on 2003/12/12 19:36:17 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql SqlSelectStatement.java
thma 2003/12/12 10:36:17
Modified: src/java/org/apache/ojb/odmg/collections DListEntry.java
DListImpl.java DMapImpl.java DMapEntry.java
src/java/org/apache/ojb/broker/accesslayer/sql
SqlSelectStatement.java
Log:
eliminate calls to deprecated API: getAutoIncrementField()
Revision Changes Path
1.21 +1 -1 db-ojb/src/java/org/apache/ojb/odmg/collections/DListEntry.java
Index: DListEntry.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DListEntry.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DListEntry.java 8 Aug 2003 20:38:25 -0000 1.20
+++ DListEntry.java 12 Dec 2003 18:36:17 -0000 1.21
@@ -164,7 +164,7 @@
try
{
PersistenceBroker broker = capsule.getBroker();
- FieldDescriptor fld = broker.getClassDescriptor(this.getClass()).getAutoIncrementField();
+ FieldDescriptor fld = broker.getClassDescriptor(this.getClass()).getAutoIncrementFields()[0];
Integer val = (Integer) broker.serviceSequenceManager().getUniqueValue(fld);
int result = val.intValue();
1.23 +1 -1 db-ojb/src/java/org/apache/ojb/odmg/collections/DListImpl.java
Index: DListImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DListImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DListImpl.java 28 Nov 2003 14:39:59 -0000 1.22
+++ DListImpl.java 12 Dec 2003 18:36:17 -0000 1.23
@@ -291,7 +291,7 @@
try
{
PersistenceBroker broker = capsule.getBroker();
- FieldDescriptor fld = broker.getClassDescriptor(this.getClass()).getAutoIncrementField();
+ FieldDescriptor fld = broker.getClassDescriptor(this.getClass()).getAutoIncrementFields()[0];
Integer val = (Integer) broker.serviceSequenceManager().getUniqueValue(fld);
int result = val.intValue();
return result;
1.17 +2 -2 db-ojb/src/java/org/apache/ojb/odmg/collections/DMapImpl.java
Index: DMapImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DMapImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DMapImpl.java 13 Mar 2003 19:58:17 -0000 1.16
+++ DMapImpl.java 12 Dec 2003 18:36:17 -0000 1.17
@@ -151,7 +151,7 @@
try
{
PersistenceBroker broker = capsule.getBroker();
- FieldDescriptor fld = broker.getClassDescriptor(this.getClass()).getAutoIncrementField();
+ FieldDescriptor fld = broker.getClassDescriptor(this.getClass()).getAutoIncrementFields()[0];
Integer val = (Integer) broker.serviceSequenceManager().getUniqueValue(fld);
int result = val.intValue();
1.14 +2 -2 db-ojb/src/java/org/apache/ojb/odmg/collections/DMapEntry.java
Index: DMapEntry.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/collections/DMapEntry.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DMapEntry.java 9 Mar 2003 17:10:48 -0000 1.13
+++ DMapEntry.java 12 Dec 2003 18:36:17 -0000 1.14
@@ -137,7 +137,7 @@
try
{
PersistenceBroker broker = capsule.getBroker();
- FieldDescriptor fld = broker.getClassDescriptor(this.getClass()).getAutoIncrementField();
+ FieldDescriptor fld = broker.getClassDescriptor(this.getClass()).getAutoIncrementFields()[0];
Integer val = (Integer) broker.serviceSequenceManager().getUniqueValue(fld);
int result = val.intValue();
1.16 +2 -2 db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSelectStatement.java
Index: SqlSelectStatement.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSelectStatement.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SqlSelectStatement.java 15 Aug 2003 14:13:07 -0000 1.15
+++ SqlSelectStatement.java 12 Dec 2003 18:36:17 -0000 1.16
@@ -289,7 +289,7 @@
// TODO: do not use the superclassfield anymore, just assume that the id is the same in both tables - @see PBroker.storeToDb
int superFieldRef = cld.getSuperClassFieldRef();
FieldDescriptor refField = cld.getFieldDescriptorByIndex(superFieldRef);
- where.append(cldSuper.getFullTableName()).append(".").append(cldSuper.getAutoIncrementField().getColumnName());
+ where.append(cldSuper.getFullTableName()).append(".").append(cldSuper.getAutoIncrementFields()[0].getColumnName());
where.append(" = ");
where.append(cld.getFullTableName()).append(".").append(refField.getColumnName());
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org