svn commit: r454226 - in /incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access: DataContext.java ObjectStore.java

[aadamchik]

Author: aadamchik
Date: Sun Oct  8 15:29:52 2006
New Revision: 454226

URL: http://svn.apache.org/viewvc?view=rev&rev=454226
Log:
CAY-680 - more refactoring - switching new object function in ObjectStore to 
use GraphManager API

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

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java?view=diff&rev=454226&r1=454225&r2=454226
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
 Sun Oct  8 15:29:52 2006
@@ -727,12 +727,15 @@
         // this will initialize to-many lists
         descriptor.injectValueHolders(dataObject);
 
+        ObjectId id = new ObjectId(objEntityName);
+        
         // note that the order of initialization of persistence artifacts 
below is
         // important - do not change it lightly
-        dataObject.setObjectId(new ObjectId(objEntityName));
+        dataObject.setObjectId(id);
         dataObject.setObjectContext(this);
         dataObject.setPersistenceState(PersistenceState.NEW);
-        getObjectStore().recordObjectCreated(dataObject);
+        getObjectStore().registerNode(id, dataObject);
+        getObjectStore().nodeCreated(id);
 
         return dataObject;
     }
@@ -820,7 +823,8 @@
         object.setObjectContext(this);
         object.setPersistenceState(PersistenceState.NEW);
 
-        getObjectStore().recordObjectCreated(object);
+        getObjectStore().registerNode(object.getObjectId(), object);
+        getObjectStore().nodeCreated(object.getObjectId());
 
         // now we need to find all arc changes, inject missing value holders 
and pull in
         // all transient connected objects

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectStore.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectStore.java?view=diff&rev=454226&r1=454225&r2=454226
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectStore.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ObjectStore.java
 Sun Oct  8 15:29:52 2006
@@ -104,14 +104,6 @@
     }
 
     /**
-     * @since 1.2
-     */
-    void recordObjectCreated(Persistent object) {
-        registerDiff(object, new NodeCreateOperation(object.getObjectId()));
-        registerNode(object.getObjectId(), object);
-    }
-
-    /**
      * Performs tracking of object relationship changes.
      * 
      * @since 1.2
@@ -780,7 +772,8 @@
                     if (delegate.shouldProcessDelete(object)) {
                         object.setPersistenceState(PersistenceState.NEW);
                         changes.remove(nodeId);
-                        recordObjectCreated(object);
+                        registerNode(nodeId, object);
+                        nodeCreated(nodeId);
                         delegate.finishedProcessDelete(object);
                     }
 
@@ -1019,12 +1012,11 @@
     }
 
     /**
-     * Does nothing.
-     * 
      * @since 1.2
      */
     public void nodeCreated(Object nodeId) {
-        throw new UnsupportedOperationException("nodeCreated");
+        Persistent object = (Persistent) getNode(nodeId);
+        registerDiff(object, new NodeCreateOperation(object.getObjectId()));
     }
 
     /**