svn commit: r479276 - /incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java

[aadamchik]

Author: aadamchik
Date: Sat Nov 25 21:01:20 2006
New Revision: 479276

URL: http://svn.apache.org/viewvc?view=rev&rev=479276
Log:
CAY-686: Weed out DataObject references from the access stack classes, 
replacing them with Persistent and ClassDescriptor
(removing DataObject references from IncrementalFaultList)

Modified:
    
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java?view=diff&rev=479276&r1=479275&r2=479276
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java
 Sat Nov 25 21:01:20 2006
@@ -30,7 +30,7 @@
 
 import org.apache.cayenne.CayenneException;
 import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.DataObject;
+import org.apache.cayenne.Persistent;
 import org.apache.cayenne.exp.Expression;
 import org.apache.cayenne.exp.ExpressionFactory;
 import org.apache.cayenne.map.DbEntity;
@@ -134,7 +134,7 @@
             helper = new DataRowListHelper();
         }
         else {
-            helper = new DataObjectListHelper();
+            helper = new PersistentListHelper();
         }
 
         if (!metadata.isFetchingDataRows() && (query instanceof SelectQuery)) {
@@ -255,7 +255,7 @@
      *         doesn require a fetch before being returned to the user.
      */
     private boolean isUnresolved(Object object) {
-        if (object instanceof DataObject) {
+        if (object instanceof Persistent) {
             return false;
         }
 
@@ -285,7 +285,7 @@
             }
         }
         else {
-            if (!(object instanceof DataObject)) {
+            if (!(object instanceof Persistent)) {
                 throw new IllegalArgumentException(
                         "Only DataObjects can be stored in this list.");
             }
@@ -372,7 +372,7 @@
                     Object id = idsIt.next();
                     Iterator oIt = objects.iterator();
                     while (oIt.hasNext()) {
-                        if (((DataObject) oIt.next())
+                        if (((Persistent) oIt.next())
                                 .getObjectId()
                                 .getIdSnapshot()
                                 .equals(id)) {
@@ -768,15 +768,14 @@
         abstract boolean replacesObject(Object object, Object objectInTheList);
     }
 
-    class DataObjectListHelper extends IncrementalListHelper {
+    class PersistentListHelper extends IncrementalListHelper {
 
         boolean incorrectObjectType(Object object) {
-            if (!(object instanceof DataObject)) {
-
+            if (!(object instanceof Persistent)) {
                 return true;
             }
 
-            DataObject dataObj = (DataObject) object;
+            Persistent dataObj = (Persistent) object;
             if (dataObj.getObjectContext() != dataContext) {
                 return true;
             }
@@ -790,22 +789,22 @@
 
         boolean objectsAreEqual(Object object, Object objectInTheList) {
 
-            if (objectInTheList instanceof DataObject) {
+            if (objectInTheList instanceof Persistent) {
                 // due to object uniquing this should be sufficient
                 return object == objectInTheList;
             }
             else {
-                return ((DataObject) 
object).getObjectId().getIdSnapshot().equals(
+                return ((Persistent) 
object).getObjectId().getIdSnapshot().equals(
                         objectInTheList);
             }
         }
 
         boolean replacesObject(Object object, Object objectInTheList) {
-            if (objectInTheList instanceof DataObject) {
+            if (objectInTheList instanceof Persistent) {
                 return false;
             }
 
-            DataObject dataObject = (DataObject) object;
+            Persistent dataObject = (Persistent) object;
             return 
dataObject.getObjectId().getIdSnapshot().equals(objectInTheList);
         }
     }