Support labels for property children

[simantics/platform.git] / bundles / org.simantics.selectionview / src / org / simantics / selectionview / function / All.java

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 150bbb8252346f61bfe6b6aca6b8eef3ff8d9a11..7d9d1dba8b02bfcddc51526ff42a6f0491940949 100644 (file)
--- 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);