From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 16 Jun 2017 07:15:37 +0000 (+0300)
Subject: Revert "Default property editing restores assertions"
X-Git-Tag: v1.31.0~310^2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=1aa531775d5221775a583fb13f35332dfff8aae8;p=simantics%2Fplatform.git

Revert "Default property editing restores assertions"

This reverts commit c4c152bf639475b85efad1e8bd6ea007c08a9e1f.

Reason: If user has set the value of a property to X, he expects it to stay as X until all eternity instead of the value changing when the assertions in the ontology change.

refs #7302

Change-Id: I5cd33d17413b118f522456b37b27df757f42861b
---

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 103c9bb01..08dd63ce0 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
@@ -1386,18 +1386,4 @@ public class Layer0Utils {
         return PrettyPrintTG.print(tg);
     }
 
-    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 150bbb825..5137dd742 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,19 +293,6 @@ 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);