X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop.update%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fupdate%2Fmodel%2FUpdateOperations.java;h=825ccf1b252ccf59c523e070cbb089d3d0120154;hb=b2bf3445afe9519017f07e41da3c6bc2bccedc6f;hp=e24e0cba8a92653485eec00c67085041e53c0cb6;hpb=69036b628df63d369733ab8bee9f402835ea1a13;p=simantics%2Finterop.git

diff --git a/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateOperations.java b/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateOperations.java
index e24e0cb..825ccf1 100644
--- a/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateOperations.java
+++ b/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateOperations.java
@@ -8,8 +8,10 @@ import java.util.Stack;
 
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
+import org.simantics.db.Session;
 import org.simantics.db.Statement;
 import org.simantics.db.WriteGraph;
+import org.simantics.db.common.request.ReadRequest;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.interop.test.GraphChanges;
 
@@ -57,6 +59,14 @@ public abstract  class UpdateOperations {
 	public GraphChanges getChanges() {
 		return changes;
 	}
+	
+	public Map<Resource, UpdateOp> getResourceMap() {
+		return resourceMap;
+	}
+	
+	public Map<Statement, UpdateOp> getStatementMap() {
+		return statementMap;
+	}
 
 	private void apply(WriteGraph g, UpdateOp op) throws DatabaseException {
 		Stack<UpdateOp> stack = new Stack<UpdateOp>();
@@ -71,16 +81,16 @@ public abstract  class UpdateOperations {
 			return;
 		}
 		stack.push(op);
-		if (op.requiresParentOps()) {
-			for (UpdateOp pop : op.getParentOps())
-				if (!pop.applied())
-					_apply(g, stack, pop);
-		} 
-		if (op.requiresSubOps()) {
-			for (UpdateOp sop : op.getSubOps())
-				if (!sop.applied())
-					_apply(g, stack, sop);
-		}
+		for (UpdateOp pop : op.getParentOps())
+		    if (op.requiresOp(pop)) {
+                if (!pop.applied())
+                    _apply(g, stack, pop);
+        } 
+		for (UpdateOp sop : op.getSubOps())
+		    if (op.requiresOp(sop)) {
+                if (!sop.applied())
+                    _apply(g, stack, sop);
+        }
 		stack.pop();
 		op.apply(g);
 	}
@@ -120,6 +130,21 @@ public abstract  class UpdateOperations {
 
 	public abstract void populate(ReadGraph g) throws DatabaseException;
 	
+	/**
+	 * Secondary populate method. Override this for chunked DB operations.  
+	 * @param session
+	 * @throws DatabaseException
+	 */
+	public void populate(Session session) throws DatabaseException {
+		session.syncRequest(new ReadRequest() {
+			
+			@Override
+			public void run(ReadGraph graph) throws DatabaseException {
+				populate(graph);
+			}
+		});
+	}
+	
 	protected boolean compares(Resource r1, Resource r2) {
 		if (r1.equals(r2))
 			return true;