Applying enumeration (or SCL value) with model specific relation.

[simantics/interop.git] / org.simantics.interop.update / src / org / simantics / interop / update / model / UpdateTree.java

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 739667228a01291bea2cdf07789e719b72624672..a971da4f41234690724961a9fc1137e13192ffe3 100644 (file)
--- 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(g, 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;
@@ -41,34 +40,37 @@ public class UpdateTree {
                return changes;
        }
        
-       protected UpdateNode createNode(ReadGraph g, Status status, Resource r) throws DatabaseException {
+       protected UpdateNode createNode(ReadGraph g, UpdateStatus status, Resource r) throws DatabaseException {
                return new UpdateNode(g,status, r);
        }
        
-       protected UpdateNode createNode(ReadGraph g, Status status, UpdateOp op) throws DatabaseException{
+       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(g, 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(g,Status.DELETED ,updateOps.getUpdateOp(r1));
+                       node = createNode(g,UpdateStatus.DELETED ,updateOps.getUpdateOp(r1));
                        nodes.put(r1, node);
                } else if (r2 != null) {
-                       node = createNode(g,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))
@@ -79,7 +81,7 @@ public class UpdateTree {
                return node;
        }
        
-       protected UpdateNode getNode(Resource r) {
+       public UpdateNode getNode(Resource r) {
                return nodes.get(r);
        }
        
@@ -131,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);
                                }
                        }
                }