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%2F61%2F3761%2F1;hp=947f516849ea7c6beea0f4ad5b982eb85d15985b;hpb=99c2a46dea84c410448a87c7f287e66a17ccde56;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 947f516..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 {
@@ -16,6 +17,8 @@ public class PropertyChange {
 	protected boolean selected = false;
 	protected boolean visible = true;
 	protected boolean enabled = true;
+	protected Object customValue = null;
+	
 	
 	public PropertyChange(GraphChanges changes, Resource left, Statement first, Resource right, Statement second) {
 		if (first == null && second == null)
@@ -88,19 +91,34 @@ public class PropertyChange {
 			graph.deny(leftSubject, pair.first.getPredicate(),pair.first.getObject());
 			return;
 		} 
+		Layer0 L0 = Layer0.getInstance(graph);
 		Resource s = leftSubject;
-		//Resource s = changes.getComparable().getLeft(rightSubject);
-		//Resource s = pair.first.getSubject();
-		Resource pred = pair.second.getPredicate();
-		if (graph.hasValue(pair.second.getObject())) {
-			Object value = graph.getValue(pair.second.getObject());
+		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;
-		
 	}
 	
 	/**
@@ -175,4 +193,12 @@ public class PropertyChange {
 		return s;
 	}
 	
+	public Object getCustomValue() {
+		return customValue;
+	}
+	
+	public void setCustomValue(Object customValue) {
+		this.customValue = customValue;
+	}
+	
 }