X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.selectionview%2Fsrc%2Forg%2Fsimantics%2Fselectionview%2Ffunction%2FAll.java;h=79541b06134deb344a5f6f71c4dda854edcfc145;hp=5137dd742ded7dfa2294364aa0e9340cea1fc904;hb=8d9659a857fb83a9fdb5c9c8663302765fddd3e8;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07

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..79541b061 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
@@ -53,7 +53,9 @@ import org.simantics.scl.compiler.types.TVar;
 import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.Types;
 import org.simantics.scl.reflection.annotations.SCLValue;
+import org.simantics.scl.runtime.function.Function1;
 import org.simantics.selectionview.SelectionInput;
+import org.simantics.selectionview.SelectionViewResources;
 import org.simantics.selectionview.StandardSelectionInput;
 import org.simantics.ui.colors.Colors;
 import org.simantics.ui.fonts.Fonts;
@@ -208,6 +210,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);
@@ -448,15 +453,20 @@ public class All {
 			Object value = null;
 			Resource formatter = property.getPossiblePropertyValue(graph, Variables.FORMATTER);
 			if(formatter != null) {
-				
 				Formatter fmt = graph.adaptContextual(formatter, property, Variable.class, Formatter.class);
 				value = fmt.format(property.getValue(graph));
-				
-			} else {
+			}
+			if(value == null) {
+				SelectionViewResources SEL = SelectionViewResources.getInstance(graph);
+				Function1<Object,String> formatterFunction = property.getPossiblePropertyValue(graph, SEL.formatter);
+				if(formatterFunction != null) {
+					value = formatterFunction.apply(property.getValue(graph));
+				}
+			}
+			if(value == null) {
 
 				Variant variant = property.getVariantValue(graph);
 				value = variant.getValue();
-				
 				Binding binding = variant.getBinding();
 				if(binding != null) {
 					Datatype dt = binding.type();