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=772289f2478f80570a28f23cbde1adacc0b8e325;hb=311d93d874e43c880c0890ff91249914aaeb7ae1;hp=5220736d4259f803da5ed032273c8e6f20d46a56;hpb=a4470f2cf50c3f6d4c586930ccd8eaa55ded25a5;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 5220736..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
@@ -81,7 +81,15 @@ public class PropertyChange {
 		if (obj.getClass() != this.getClass())
 			return false;
 		PropertyChange c = (PropertyChange)obj;
-		return pair.equals(c.pair);
+		if (!leftSubject.equals(c.leftSubject))
+			return false;
+		if (!rightSubject.equals(c.rightSubject))
+			return false;
+		if (pair.first != null && pair.first.equals(c.pair.first))
+			return true;
+		if (pair.second != null && pair.second.equals(c.pair.second))
+			return true;
+		return false;
 	}
 	
 	public void apply(WriteGraph graph) throws DatabaseException {
@@ -95,30 +103,52 @@ 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));
 			AddDeleteUpdateOp.copyProperties(graph, pair.second.getObject(), valueResource);
 			graph.claim(s, pred, valueResource);
+			applied = true;
+		} else {
+			Resource type = graph.getPossibleType(pair.second.getObject(), L0.Value);
+			if (type != null && graph.hasStatement(type, L0.Enumeration, type)) {
+				Resource pred = _getPredicate();
+				graph.deny(s, pred);
+				graph.claim(s, pred, pair.second.getObject());
+				applied = true;
+			}
+			
 		}
-		applied = true;
+		
+	}
+	
+	private Resource _getPredicate() {
+		Resource pred = pair.second.getPredicate();
+		if (getChanges().getComparable().containsRight(pred))
+			pred = getChanges().getComparable().getLeft(pred);
+		return pred;
 	}
 	
 	/**
@@ -198,6 +228,9 @@ public class PropertyChange {
 	}
 	
 	public void setCustomValue(Object customValue) {
+		if (applied) {
+			throw new RuntimeException("Cannot change already applied value");
+		}
 		this.customValue = customValue;
 	}