You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2006/10/12 04:54:14 UTC
svn commit: r463114 - in
/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access:
DataRowUtils.java ObjectResolver.java
Author: aadamchik
Date: Wed Oct 11 19:54:13 2006
New Revision: 463114
URL: http://svn.apache.org/viewvc?view=rev&rev=463114
Log:
CAY-686 Weed out DataObject references from the access stack classes, replacing them with Persistent and ClassDescriptor
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataRowUtils.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectResolver.java
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataRowUtils.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataRowUtils.java?view=diff&rev=463114&r1=463113&r2=463114
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataRowUtils.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataRowUtils.java Wed Oct 11 19:54:13 2006
@@ -19,7 +19,6 @@
package org.apache.cayenne.access;
-import org.apache.cayenne.DataObject;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.Fault;
import org.apache.cayenne.ObjectId;
@@ -55,7 +54,7 @@
static void mergeObjectWithSnapshot(
DataContext context,
ClassDescriptor descriptor,
- DataObject object,
+ Persistent object,
DataRow snapshot) {
int state = object.getPersistenceState();
@@ -243,7 +242,7 @@
return false;
}
- DataObject toOneTarget = (DataObject) targetObject;
+ Persistent toOneTarget = (Persistent) targetObject;
ObjectId currentId = (toOneTarget != null) ? toOneTarget.getObjectId() : null;
// if ObjectId is temporary, target is definitely modified...
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectResolver.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectResolver.java?view=diff&rev=463114&r1=463113&r2=463114
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectResolver.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectResolver.java Wed Oct 11 19:54:13 2006
@@ -199,7 +199,7 @@
ObjectId anId = createObjectId(row, classDescriptor.getEntity(), null);
// this will create a HOLLOW object if it is not registered yet
- DataObject object = (DataObject) context.localObject(anId, null);
+ Persistent object = context.localObject(anId, null);
// deal with object state
int state = object.getPersistenceState();
@@ -214,7 +214,10 @@
classDescriptor,
object,
row);
- object.setSnapshotVersion(row.getVersion());
+
+ if (object instanceof DataObject) {
+ ((DataObject) object).setSnapshotVersion(row.getVersion());
+ }
}
break;
case PersistenceState.HOLLOW:
@@ -229,7 +232,9 @@
classDescriptor,
object,
row);
- object.setSnapshotVersion(row.getVersion());
+ if (object instanceof DataObject) {
+ ((DataObject) object).setSnapshotVersion(row.getVersion());
+ }
break;
default:
break;
@@ -241,7 +246,7 @@
ObjEntity getEntity() {
return descriptor.getEntity();
}
-
+
ClassDescriptor getDescriptor() {
return descriptor;
}