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=a971da4f41234690724961a9fc1137e13192ffe3;hb=311d93d874e43c880c0890ff91249914aaeb7ae1;hp=d06d70637b539618aff056b30fb08c8954c667bc;hpb=2a37041c6da8864656e7217dbcc3d6dae8cd65be;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 d06d706..a971da4 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
@@ -7,7 +7,6 @@ import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.interop.test.GraphChanges;
-import org.simantics.interop.update.model.UpdateNode.Status;
 
 
 public class UpdateTree {
@@ -21,7 +20,7 @@ public class UpdateTree {
 	public UpdateTree(ReadGraph g, GraphChanges changes, UpdateOperations updateOps) throws DatabaseException {
 		this.changes = changes;
 		this.nodes = new HashMap<Resource, UpdateNode>();
-		this.rootNode = createNode(Status.EXIST, changes.getResource1());
+		this.rootNode = createNode(g, UpdateStatus.EXIST, changes.getResource1());
 		nodes.put(changes.getResource1(), rootNode);
 		nodes.put(changes.getResource2(), rootNode);
 		this.updateOps = updateOps;
@@ -37,57 +36,64 @@ public class UpdateTree {
 		return rootNode;
 	}
 	
-	protected UpdateNode createNode(Status status, Resource r) {
-		return new UpdateNode(status, r);
+	public GraphChanges getChanges() {
+		return changes;
 	}
 	
-	protected UpdateNode createNode(Status status, UpdateOp op) {
-		return new UpdateNode(status, op);
+	protected UpdateNode createNode(ReadGraph g, UpdateStatus status, Resource r) throws DatabaseException {
+		return new UpdateNode(g,status, r);
 	}
 	
-	private UpdateNode createNode(Resource r1, Resource r2) {
+	protected UpdateNode createNode(ReadGraph g, UpdateStatus status, UpdateOp op) throws DatabaseException{
+		return new UpdateNode(g,status, op);
+	}
+	
+	private UpdateNode createNode(ReadGraph g, Resource r1, Resource r2) throws DatabaseException {
 		UpdateNode node = null;
 		if (r1 != null && r2 != null) {
-			node =  createNode(Status.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) {
-			node = createNode(Status.DELETED ,updateOps.getUpdateOp(r1));
+			node = createNode(g,UpdateStatus.DELETED ,updateOps.getUpdateOp(r1));
 			nodes.put(r1, node);
 		} else if (r2 != null) {
-			node = createNode(Status.NEW, updateOps.getUpdateOp(r2));
+			node = createNode(g,UpdateStatus.NEW, updateOps.getUpdateOp(r2));
 			nodes.put(r2, node);
 		}
 		return node;
 	}
 	
 	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))
 			return nodes.get(r2);
 		
-		UpdateNode node = createNode(r1, r2);
+		UpdateNode node = createNode(g, r1, r2);
 		connectParent(g,node);
 		return node;
 	}
 	
+	public UpdateNode getNode(Resource r) {
+		return nodes.get(r);
+	}
+	
 	protected boolean connectParent(ReadGraph g, UpdateNode node) throws DatabaseException {
 		UpdateNode parent = null;
 		while (true) {
 			Resource parentResource = node.getParentResource(g);
 			parent = nodes.get(parentResource);
 			if (parent == null) {
-				if (changes.getComparable().containsLeft(parentResource)) {
-					parent = createNode(parentResource, changes.getComparable().getRight(parentResource));
-				} else if (changes.getComparable().containsRight(parentResource)) {
-					parent = createNode(changes.getComparable().getLeft(parentResource) ,parentResource);
-				} else {
+				parent = getOrCreate(g, parentResource);
+				if (parent == null)
 					return false;
-				}
 				//parent.setStatus(Status.CONTAINS);
 				parent.addChild(node);
 				node = parent;
@@ -100,6 +106,23 @@ public class UpdateTree {
 		}
 	}
 	
+	protected UpdateNode getOrCreate(ReadGraph g, Resource parentResource) throws DatabaseException {
+		UpdateNode parent = nodes.get(parentResource);
+		if (parent == null) {
+			if (changes.getComparable().containsLeft(parentResource)) {
+				parent = createNode(g, parentResource, changes.getComparable().getRight(parentResource));
+			} else if (changes.getComparable().containsRight(parentResource)) {
+				parent = createNode(g, changes.getComparable().getLeft(parentResource) ,parentResource);
+			} else {
+				return null;
+			}
+			//parent.setStatus(Status.CONTAINS
+		} 
+		return parent;
+	}
+	
+	
+	
 	protected boolean handleCustom(ReadGraph g, UpdateOp op) throws DatabaseException {
 		return false;
 	}
@@ -110,8 +133,13 @@ public class UpdateTree {
 			if (!handleCustom(g, op)) {
 				if (op.isAdd()) {
 					addNode(g, null,op.getResource());
-				} else {
+				} 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);
 				}
 			}
 		}