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=10aaf26ea42ba539e7b13d4c2c7eeb2c2fc76abd;hb=3deac27ee4a844aa35d423eeae20038e15d81b5f;hp=7d9d1dba8b02bfcddc51526ff42a6f0491940949;hpb=6cc84e9fd4fb1bf95a20538aeca2cae9b8325968;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 7d9d1dba8..10aaf26ea 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;
@@ -451,15 +453,22 @@ 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();