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/11/26 06:04:14 UTC
svn commit: r479277 - in
/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne:
query/NamedQuery.java util/PersistentObjectList.java
Author: aadamchik
Date: Sat Nov 25 21:04:13 2006
New Revision: 479277
URL: http://svn.apache.org/viewvc?view=rev&rev=479277
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/query/NamedQuery.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/PersistentObjectList.java
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/query/NamedQuery.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/query/NamedQuery.java?view=diff&rev=479277&r1=479276&r2=479277
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/query/NamedQuery.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/query/NamedQuery.java Sat Nov 25 21:04:13 2006
@@ -25,14 +25,13 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.DataObject;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.util.Util;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
/**
* A query that is a reference to a named parameterized query stored in the mapping. The
@@ -146,7 +145,7 @@
Object value = entry.getValue();
- if ((value instanceof Persistent) && !(value instanceof DataObject)) {
+ if (value instanceof Persistent) {
value = ((Persistent) value).getObjectId();
}
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/PersistentObjectList.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/PersistentObjectList.java?view=diff&rev=479277&r1=479276&r2=479277
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/PersistentObjectList.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/util/PersistentObjectList.java Sat Nov 25 21:04:13 2006
@@ -26,7 +26,6 @@
import java.util.ListIterator;
import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.DataObject;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.ValueHolder;
@@ -330,8 +329,8 @@
while (it.hasNext()) {
Object next = it.next();
- if (next instanceof DataObject) {
- DataObject dataObject = (DataObject) next;
+ if (next instanceof Persistent) {
+ Persistent dataObject = (Persistent) next;
if (dataObject.getPersistenceState() == PersistenceState.TRANSIENT) {
continue;
}