X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop.update%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fupdate%2Fmodel%2FPropertyChange.java;h=5220736d4259f803da5ed032273c8e6f20d46a56;hb=refs%2Fchanges%2F64%2F3764%2F1;hp=54d2f76f55fe083f1af1f54a904cf0cc79709dd6;hpb=1895b93f561dd38f0dcaa8e4a59210508613a2ea;p=simantics%2Finterop.git

diff --git a/org.simantics.interop.update/src/org/simantics/interop/update/model/PropertyChange.java b/org.simantics.interop.update/src/org/simantics/interop/update/model/PropertyChange.java
index 54d2f76..5220736 100644
--- a/org.simantics.interop.update/src/org/simantics/interop/update/model/PropertyChange.java
+++ b/org.simantics.interop.update/src/org/simantics/interop/update/model/PropertyChange.java
@@ -5,6 +5,7 @@ import org.simantics.db.Statement;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.interop.test.GraphChanges;
+import org.simantics.layer0.Layer0;
 import org.simantics.utils.datastructures.Pair;
 
 public class PropertyChange {
@@ -90,19 +91,32 @@ public class PropertyChange {
 			graph.deny(leftSubject, pair.first.getPredicate(),pair.first.getObject());
 			return;
 		} 
+		Layer0 L0 = Layer0.getInstance(graph);
 		Resource s = leftSubject;
-		Object value = null;
-		if (customValue != null)
-			value = customValue;
-		else if (graph.hasValue(pair.second.getObject())) {
-			value = graph.getValue(pair.second.getObject());
-		}
-		Resource pred = pair.second.getPredicate();
-		if (value != null) {
+		if (graph.isInstanceOf(pair.second.getObject(), L0.Literal)) {
+			Object value = null;
+			if (customValue != null)
+				value = customValue;
+			else if (graph.hasValue(pair.second.getObject())) {
+				value = graph.getValue(pair.second.getObject());
+			}
+			Resource pred = pair.second.getPredicate();
+			if (getChanges().getComparable().containsRight(pred))
+				pred = getChanges().getComparable().getLeft(pred);
+			
+			if (value != null) {
+				graph.deny(s, pred);
+				graph.claimLiteral(s, pred, value);
+			} else {
+				graph.deny(s,pred);
+			}
+		} else if (graph.isInstanceOf(pair.second.getObject(), L0.SCLValue)) {
+			Resource pred = pair.second.getPredicate();
 			graph.deny(s, pred);
-			graph.claimLiteral(s, pred, value);
-		} else {
-			graph.deny(s,pred);
+			Resource valueResource = graph.newResource();
+			graph.claim(valueResource, L0.InstanceOf, graph.getSingleObject(pair.second.getObject(), L0.InstanceOf));
+			AddDeleteUpdateOp.copyProperties(graph, pair.second.getObject(), valueResource);
+			graph.claim(s, pred, valueResource);
 		}
 		applied = true;
 	}