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=0c1882c3fbcc38b6c7eadaeb5b88fa0f65ff146b;hb=28413fd27e56ea8b5018ce5a11b1fd132d5425d7;hp=9c929c59cc4f267d14d1cc5f867d05fce23c00d6;hpb=9076887bb7f54a038ef1a32c2f1121f7ebb5ed7d;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 9c929c5..0c1882c 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
@@ -21,7 +21,8 @@ import org.simantics.interop.test.GraphChanges;
 public abstract  class UpdateOperations {
 	
 	private List<UpdateOp> operations = new ArrayList<UpdateOp>();
-	private Map<Resource, UpdateOp> opMap = new HashMap<Resource, UpdateOp>();
+	private Map<Resource, UpdateOp> resourceMap = new HashMap<Resource, UpdateOp>();
+	private Map<Statement, UpdateOp> statementMap = new HashMap<Statement, UpdateOp>();
 	private GraphChanges changes;
 	
 	public UpdateOperations(GraphChanges changes) {
@@ -29,7 +30,11 @@ public abstract  class UpdateOperations {
 	}
 	
 	public UpdateOp getUpdateOp(Resource r) {
-		return opMap.get(r);
+		return resourceMap.get(r);
+	}
+	
+	public UpdateOp getUpdateOp(Statement s) {
+		return statementMap.get(s);
 	}
 	
 	public void applyAll(WriteGraph g) throws DatabaseException {
@@ -52,6 +57,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>();
@@ -61,19 +74,21 @@ public abstract  class UpdateOperations {
 	private void _apply(WriteGraph g, Stack<UpdateOp> stack, UpdateOp op) throws DatabaseException {
 		if (op.applied())
 			return;
-		if (stack.contains(op))
+		if (stack.contains(op)) {
+			op.apply(g);
 			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);
 		}
+		stack.push(op);
+		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);
 	}
@@ -85,21 +100,30 @@ public abstract  class UpdateOperations {
 	}
 	
 	protected void addOp(Resource r, UpdateOp op) {
-		opMap.put(r, op);
+		resourceMap.put(r, op);
+		operations.add(op);
+	}
+	
+	protected void addOp(Statement s, UpdateOp op) {
+		statementMap.put(s, op);
 		operations.add(op);
 	}
 	
 	protected void replaceOp(Resource r, UpdateOp op) {
-		UpdateOp oldOp = opMap.remove(r);
+		UpdateOp oldOp = resourceMap.remove(r);
 		if (oldOp != null) {
 			operations.remove(oldOp);
 		}
-		opMap.put(r, op);
+		resourceMap.put(r, op);
 		operations.add(op);
 	}
 	
 	protected UpdateOp getOP(Resource r) {
-		return opMap.get(r);
+		return resourceMap.get(r);
+	}
+	
+	protected UpdateOp getOP(Statement r) {
+		return statementMap.get(r);
 	}
 
 	public abstract void populate(ReadGraph g) throws DatabaseException;