X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop.update%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fupdate%2Fmodel%2FAddDeleteUpdateOp.java;h=0ddbcb76c1c36e46ad4b91883bda75b1cdcda9f6;hb=88fcf43b9eb2e217b50bf67cee58edaef4637a59;hp=f270d46e87df8f169e47c2dd4339063cdcc54ae1;hpb=c201a20a77db051116870d6c7eece50374293824;p=simantics%2Finterop.git

diff --git a/org.simantics.interop.update/src/org/simantics/interop/update/model/AddDeleteUpdateOp.java b/org.simantics.interop.update/src/org/simantics/interop/update/model/AddDeleteUpdateOp.java
index f270d46..0ddbcb7 100644
--- a/org.simantics.interop.update/src/org/simantics/interop/update/model/AddDeleteUpdateOp.java
+++ b/org.simantics.interop.update/src/org/simantics/interop/update/model/AddDeleteUpdateOp.java
@@ -24,6 +24,11 @@ public abstract class AddDeleteUpdateOp extends UpdateOp {
 		super(changes);
 	}
 	
+	public AddDeleteUpdateOp(boolean add, GraphChanges changes) {
+		super(changes);
+		this.add = add;
+	}
+	
 	@Override
 	public boolean isAdd() {
 		return add;
@@ -37,10 +42,10 @@ public abstract class AddDeleteUpdateOp extends UpdateOp {
 	@Override
 	public boolean requiresOp(UpdateOp op) {
 	    if (add) {
-	        if (getParentOps().contains(op))
+	        if (getParentOps().contains(op) && op.isAdd())
 	            return true;
 	    } else {
-	        if (getSubOps().contains(op))
+	        if (getSubOps().contains(op) && op.isDelete())
                 return true;
 	    }
 	    return false;
@@ -62,7 +67,7 @@ public abstract class AddDeleteUpdateOp extends UpdateOp {
 				continue;
 			if (g.isInstanceOf(s.getObject(), l0.Literal)) {
 				Object value = g.getPossibleValue(s.getObject());
-				System.out.println(NameUtils.getSafeName(g, s.getSubject()) + " " + NameUtils.getSafeName(g, s.getPredicate()) + " " + NameUtils.getSafeName(g, s.getObject()) + " " + value);
+				//System.out.println(NameUtils.getSafeName(g, s.getSubject()) + " " + NameUtils.getSafeName(g, s.getPredicate()) + " " + NameUtils.getSafeName(g, s.getObject()) + " " + value);
 				if (value != null) {
 					Statement valueStm = g.getPossibleStatement(destination, s.getPredicate());
 					Resource valueResource = null;
@@ -82,11 +87,36 @@ public abstract class AddDeleteUpdateOp extends UpdateOp {
 				g.claim(destination, s.getPredicate(), valueResource);
 				copyProperties(g, s.getObject(), valueResource);
 			} else {
-				throw new DatabaseException("Expected to copy property resource " + s.getObject());
+				Resource type = g.getPossibleType(s.getObject(), l0.Value);
+				if (type != null && g.hasStatement(type, l0.Enumeration, type)) {
+					g.deny(destination, s.getPredicate());
+					g.claim(destination, s.getPredicate(), s.getObject());
+				} else {
+					throw new DatabaseException("Expected to copy property resource " + s.getObject());
+				}
+			}
+		}
+	}
+	
+	public static void copyTags(WriteGraph g, Resource source, Resource destination) throws DatabaseException {
+		Layer0 L0 = Layer0.getInstance(g);
+		for (Statement s : g.getStatements(source, L0.IsWeaklyRelatedTo)) {
+			if (s.getObject().equals(source)) {
+				g.claim(destination, s.getPredicate(), destination);
 			}
 		}
 	}
 	
+	public static void copyTypes(WriteGraph g, Resource source, Resource destination) throws DatabaseException {
+		Layer0 L0 = Layer0.getInstance(g);
+		for (Resource r : g.getObjects(source, L0.InstanceOf))
+			g.claim(destination, L0.InstanceOf, r);
+		for (Resource r : g.getObjects(source, L0.Inherits))
+			g.claim(destination, L0.Inherits, r);
+		for (Resource r : g.getObjects(source, L0.SubrelationOf))
+			g.claim(destination, L0.SubrelationOf, r);
+	}
+	
 	protected void copyIssues(WriteGraph g, Resource source, Resource destination) throws DatabaseException {
 		Layer0 l0 = Layer0.getInstance(g);
 		IssueResource ir = IssueResource.getInstance(g);