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 2013/08/04 13:56:28 UTC
svn commit: r1510136 -
/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/access/DataDomainIndirectDiffBuilder.java
Author: aadamchik
Date: Sun Aug 4 11:56:27 2013
New Revision: 1510136
URL: http://svn.apache.org/r1510136
Log:
cleanup
Modified:
cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/access/DataDomainIndirectDiffBuilder.java
Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/access/DataDomainIndirectDiffBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/access/DataDomainIndirectDiffBuilder.java?rev=1510136&r1=1510135&r2=1510136&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/access/DataDomainIndirectDiffBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/access/DataDomainIndirectDiffBuilder.java Sun Aug 4 11:56:27 2013
@@ -19,6 +19,9 @@
package org.apache.cayenne.access;
+import java.util.Collection;
+import java.util.HashSet;
+
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.graph.GraphChangeHandler;
@@ -28,10 +31,6 @@ import org.apache.cayenne.map.EntityReso
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
/**
* A processor of ObjectStore indirect changes, such as flattened relationships and
* to-many relationships.
@@ -42,7 +41,7 @@ final class DataDomainIndirectDiffBuilde
private final DataDomainFlushAction parent;
private final EntityResolver resolver;
- private final Collection indirectModifications;
+ private final Collection<ObjectId> indirectModifications;
private final Collection<FlattenedArcKey> flattenedInserts;
private final Collection<FlattenedArcKey> flattenedDeletes;
@@ -73,15 +72,17 @@ final class DataDomainIndirectDiffBuilde
}
}
+ @Override
public void arcCreated(Object nodeId, Object targetNodeId, Object arcId) {
ObjEntity entity = resolver.getObjEntity(((ObjectId) nodeId).getEntityName());
ObjRelationship relationship = (ObjRelationship) entity.getRelationship(arcId
.toString());
if (relationship.isSourceIndependentFromTargetChange()) {
-
- if (!((ObjectId) nodeId).isTemporary()) {
- indirectModifications.add(nodeId);
+
+ ObjectId nodeObjectId = (ObjectId) nodeId;
+ if (!nodeObjectId.isTemporary()) {
+ indirectModifications.add(nodeObjectId);
}
if (relationship.isFlattened()) {
@@ -105,7 +106,8 @@ final class DataDomainIndirectDiffBuilde
}
}
}
-
+
+ @Override
public void arcDeleted(Object nodeId, Object targetNodeId, Object arcId) {
ObjEntity entity = resolver.getObjEntity(((ObjectId) nodeId).getEntityName());
@@ -114,8 +116,9 @@ final class DataDomainIndirectDiffBuilde
if (relationship.isSourceIndependentFromTargetChange()) {
// do not record temporary id mods...
- if (!((ObjectId) nodeId).isTemporary()) {
- indirectModifications.add(nodeId);
+ ObjectId nodeObjectId = (ObjectId) nodeId;
+ if (!nodeObjectId.isTemporary()) {
+ indirectModifications.add(nodeObjectId);
}
if (relationship.isFlattened()) {
@@ -141,18 +144,22 @@ final class DataDomainIndirectDiffBuilde
}
}
+ @Override
public void nodeIdChanged(Object nodeId, Object newId) {
// noop
}
+ @Override
public void nodeCreated(Object nodeId) {
// noop
}
+ @Override
public void nodeRemoved(Object nodeId) {
// noop
}
+ @Override
public void nodePropertyChanged(
Object nodeId,
String property,