X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.selectionview%2Fsrc%2Forg%2Fsimantics%2Fselectionview%2Ffunction%2FAll.java;h=7d9d1dba8b02bfcddc51526ff42a6f0491940949;hb=704e41fc543094311b7e70f2d705b2eba9f6574b;hp=150bbb8252346f61bfe6b6aca6b8eef3ff8d9a11;hpb=3f5adda763f6281e9988277d067c1f71615e3da2;p=simantics%2Fplatform.git

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..7d9d1dba8 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
@@ -208,6 +208,9 @@ public class All {
 	public static Object getPropertyChildName(ReadGraph graph, Resource resource, Object context) throws DatabaseException {
 		if(context instanceof Variable) {
 			Variable variable = (Variable)context;
+			String label = variable.getParent(graph).getPossiblePropertyValue(graph, "HasLabel", Bindings.STRING);
+			if(label != null)
+				return label;
 			return variable.getParent(graph).getName(graph);
 		}
 		throw new DatabaseException("Unknown context " + context);
@@ -293,19 +296,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);