Author: aadamchik
Date: Sun Oct 8 15:21:42 2006
New Revision: 454225
URL: http://svn.apache.org/viewvc?view=rev&rev=454225
Log:
CAY-680 - more refactoring - switching delete function in ObjectStore to use
Graphmanager API
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.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/DataContextDeleteAction.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java?view=diff&rev=454225&r1=454224&r2=454225
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContextDeleteAction.java
Sun Oct 8 15:21:42 2006
@@ -104,7 +104,8 @@
private void deletePersistent(DataObject object, int oldState)
throws DeleteDenyException {
- dataContext.getObjectStore().recordObjectDeleted(object);
+ object.setPersistenceState(PersistenceState.DELETED);
+ dataContext.getObjectStore().nodeRemoved(object.getObjectId());
processDeleteRules(object, oldState);
}
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=454225&r1=454224&r2=454225
==============================================================================
---
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:21:42 2006
@@ -106,14 +106,6 @@
/**
* @since 1.2
*/
- void recordObjectDeleted(Persistent object) {
- object.setPersistenceState(PersistenceState.DELETED);
- registerDiff(object, new NodeDeleteOperation(object.getObjectId()));
- }
-
- /**
- * @since 1.2
- */
void recordObjectCreated(Persistent object) {
registerDiff(object, new NodeCreateOperation(object.getObjectId()));
registerNode(object.getObjectId(), object);
@@ -1036,12 +1028,11 @@
}
/**
- * Does nothing.
- *
* @since 1.2
*/
public void nodeRemoved(Object nodeId) {
- throw new UnsupportedOperationException("nodeRemoved");
+ Persistent object = (Persistent) getNode(nodeId);
+ registerDiff(object, new NodeDeleteOperation(nodeId));
}
/**
