From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 16 Jun 2017 07:09:47 +0000 (+0300)
Subject: Merge "Default property editing restores assertions"
X-Git-Tag: v1.31.0~311
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=3f5adda763f6281e9988277d067c1f71615e3da2;hp=3e8cd4aef089a228d7f2e141f2b2159f820a4266

Merge "Default property editing restores assertions"
---

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java
index 198ee41b7..5ccfcf325 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java
@@ -1387,4 +1387,18 @@ public class Layer0Utils {
         return PrettyPrintTG.print(tg, ignoreIdentifiers);
     }
 
+    public static Resource getPossibleAssertedObject(ReadGraph graph, Resource resource, Resource predicate) throws DatabaseException {
+    	Resource result = null;
+    	for(Resource type : graph.getPrincipalTypes(resource)) {
+    		Collection<Resource> rs = graph.getAssertedObjects(type, predicate);
+    		if(rs.size() > 1) return null;
+    		if(rs.size() == 1) {
+    			Resource ass = rs.iterator().next();
+    			if (result != null && !result.equals(ass)) return null;
+    			result = ass;
+    		}
+    	}
+    	return result;
+    }
+    
 }
diff --git a/bundles/org.simantics.selectionview/src/org/simantics/selectionview/function/All.java b/bundles/org.simantics.selectionview/src/org/simantics/selectionview/function/All.java
index 5137dd742..150bbb825 100644
--- a/bundles/org.simantics.selectionview/src/org/simantics/selectionview/function/All.java
+++ b/bundles/org.simantics.selectionview/src/org/simantics/selectionview/function/All.java
@@ -293,6 +293,19 @@ public class All {
 
 		}
 
+		if(!asserted) {
+			Resource assertedObject = Layer0Utils.getPossibleAssertedObject(graph, container, property);
+			if(assertedObject != null) {
+				if(graph.isInstanceOf(assertedObject, newType)) {
+					Object assertedValue = graph.getValue(assertedObject, (Binding)_binding);
+					if(assertedValue.equals(value)) {
+						graph.deny(container, property);
+						return null;
+					}
+				}
+			}
+		}
+		
 		Datatype datatype = variable.getDatatype(graph);
 		Binding binding = (Binding)_binding;
 		Layer0Utils.claimAdaptedValue(graph, objectResource, value, binding, datatype);