X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop.update%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fupdate%2Fmodel%2FUpdateTree.java;h=a558f84462cf5e8cfe6548f761afa0c85cdb00fe;hb=b2bf3445afe9519017f07e41da3c6bc2bccedc6f;hp=8163306015529f1fbf7bb237181102469b3c0f60;hpb=ca99df4266f28ae07fd4c30edb2831da65b79ffd;p=simantics%2Finterop.git

diff --git a/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateTree.java b/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateTree.java
index 8163306..a558f84 100644
--- a/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateTree.java
+++ b/org.simantics.interop.update/src/org/simantics/interop/update/model/UpdateTree.java
@@ -5,7 +5,10 @@ import java.util.Map;
 
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
+import org.simantics.db.Session;
+import org.simantics.db.common.request.ResourceRead;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.request.Read;
 import org.simantics.interop.test.GraphChanges;
 
 
@@ -28,6 +31,29 @@ public class UpdateTree {
 		populate(g);
 	}
 	
+	public UpdateTree(Session session, GraphChanges changes, UpdateOperations updateOps) throws DatabaseException {
+		this.changes = changes;
+		this.nodes = new HashMap<Resource, UpdateNode>();
+		this.rootNode = session.syncRequest(new NodeRequest(UpdateStatus.EXIST, changes.getResource1()));
+		nodes.put(changes.getResource1(), rootNode);
+		nodes.put(changes.getResource2(), rootNode);
+		this.updateOps = updateOps;
+		this.updateOps.populate(session);
+		populate(session);
+	}
+	
+	private class NodeRequest extends ResourceRead<UpdateNode> {
+		UpdateStatus status;
+		public NodeRequest(UpdateStatus status, Resource r) {
+			super(r);
+			this.status = status;
+		}
+		@Override
+		public UpdateNode perform(ReadGraph graph) throws DatabaseException {
+			return createNode(graph, status, resource);
+		}
+	}
+	
 	public UpdateOperations getUpdateOps() {
 		return updateOps;
 	}
@@ -51,7 +77,13 @@ public class UpdateTree {
 	private UpdateNode createNode(ReadGraph g, Resource r1, Resource r2) throws DatabaseException {
 		UpdateNode node = null;
 		if (r1 != null && r2 != null) {
-			node =  createNode(g, UpdateStatus.EXIST, r1);
+		    UpdateOp op = updateOps.getUpdateOp(r1);
+		    if (op == null)
+		        op = updateOps.getUpdateOp(r2);
+            if (op == null)		        
+                node = createNode(g, UpdateStatus.EXIST, r1);
+            else
+                node = createNode(g, UpdateStatus.EXIST, op);
 			nodes.put(r1, node);
 			nodes.put(r2, node);
 		} else if (r1 != null) {
@@ -65,9 +97,6 @@ public class UpdateTree {
 	}
 	
 	public UpdateNode addNode(ReadGraph g, Resource r1, Resource r2) throws DatabaseException {
-		if (r1 != null && r2 != null) {
-			return null;
-		}
 		if (nodes.containsKey(r1))
 			return nodes.get(r1);
 		if (nodes.containsKey(r2))
@@ -78,7 +107,7 @@ public class UpdateTree {
 		return node;
 	}
 	
-	protected UpdateNode getNode(Resource r) {
+	public UpdateNode getNode(Resource r) {
 		return nodes.get(r);
 	}
 	
@@ -124,18 +153,52 @@ public class UpdateTree {
 		return false;
 	}
 	
-	private void populate(ReadGraph g) throws DatabaseException{
+	protected void populate(ReadGraph g) throws DatabaseException{
 
 		for (UpdateOp op : updateOps.getOperations()) {
-			if (!handleCustom(g, op)) {
-				if (op.isAdd()) {
-					addNode(g, null,op.getResource());
-				} else {
-					addNode(g, op.getResource(), null);
-				}
+			populate(g, op);
+		}
+		
+	}
+	
+	protected void populate(ReadGraph g, UpdateOp op) throws DatabaseException{
+		if (!handleCustom(g, op)) {
+			if (op.isAdd()) {
+				addNode(g, null,op.getResource());
+			} else if (op.isDelete()){
+				addNode(g, op.getResource(), null);
+			} else if (op.isChange()) {
+				Resource o = op.getResource();
+			    Resource l = getChanges().getComparable().containsLeft(o) ? o :getChanges().getComparable().getLeft(o);
+			    Resource r = getChanges().getComparable().containsRight(o) ? o :getChanges().getComparable().getRight(o);
+			    addNode(g, l, r);
 			}
 		}
+	}
+	
+	protected void populate(Session session) throws DatabaseException{
+		int i = 0;
+		while (i < updateOps.getOperations().size()) {
+			i = session.syncRequest(new PopulateRead(i));
+		}
+	}
+	
+	protected class PopulateRead implements Read<Integer> {
+		int s;
+		public PopulateRead(int s) {
+			this.s = s;
+		}
 		
+		public Integer perform(ReadGraph graph) throws DatabaseException {
+			int l = s + 100;
+			if (l > updateOps.getOperations().size())
+				l = updateOps.getOperations().size();
+			for (int i = s; i < l; i++) {
+				UpdateOp op = updateOps.getOperations().get(i);
+				populate(graph, op);
+			}
+			return l;
+		}
 	}
 
 }