X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.interop.update%2Fsrc%2Forg%2Fsimantics%2Finterop%2Fupdate%2Fmodel%2FPropertyChange.java;h=772289f2478f80570a28f23cbde1adacc0b8e325;hb=refs%2Fchanges%2F43%2F4643%2F1;hp=be6e5e0bbda38498fd22388d6dc6e2ed31dd4b45;hpb=37acf1273cdf0be148b22625db2baa15a4077d0b;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 be6e5e0..772289f 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
@@ -103,24 +103,28 @@ public class PropertyChange {
 		Resource s = leftSubject;
 		if (graph.isInstanceOf(pair.second.getObject(), L0.Literal)) {
 			Object value = null;
+			Resource type = 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);
+			type = graph.getPossibleType(pair.second.getObject(), L0.Literal);
 			
+			Resource pred = _getPredicate();
 			if (value != null) {
 				graph.deny(s, pred);
-				graph.claimLiteral(s, pred, value);
+				if (type != null) {
+					graph.claimLiteral(s, pred, type, value);
+				} else {
+					graph.claimLiteral(s, pred, value);
+				}
 			} else {
 				graph.deny(s,pred);
 			}
 			applied = true;
 		} else if (graph.isInstanceOf(pair.second.getObject(), L0.SCLValue)) {
-			Resource pred = pair.second.getPredicate();
+			Resource pred = _getPredicate();
 			graph.deny(s, pred);
 			Resource valueResource = graph.newResource();
 			graph.claim(valueResource, L0.InstanceOf, graph.getSingleObject(pair.second.getObject(), L0.InstanceOf));
@@ -130,7 +134,7 @@ public class PropertyChange {
 		} else {
 			Resource type = graph.getPossibleType(pair.second.getObject(), L0.Value);
 			if (type != null && graph.hasStatement(type, L0.Enumeration, type)) {
-				Resource pred = pair.second.getPredicate();
+				Resource pred = _getPredicate();
 				graph.deny(s, pred);
 				graph.claim(s, pred, pair.second.getObject());
 				applied = true;
@@ -140,6 +144,13 @@ public class PropertyChange {
 		
 	}
 	
+	private Resource _getPredicate() {
+		Resource pred = pair.second.getPredicate();
+		if (getChanges().getComparable().containsRight(pred))
+			pred = getChanges().getComparable().getLeft(pred);
+		return pred;
+	}
+	
 	/**
 	 * Sets selected state. 
 	 * @param select