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%2FDisplayValueVariableAdapter.java;h=7d90d33926c9d94675dbed2665d44515548f4f15;hp=2eaba75d60db700d72c2d1a337363df7c265ef43;hb=8d9659a857fb83a9fdb5c9c8663302765fddd3e8;hpb=e0f2b602b8c67f642b1a88ef588b401f4e64a553

diff --git a/bundles/org.simantics.selectionview/src/org/simantics/selectionview/DisplayValueVariableAdapter.java b/bundles/org.simantics.selectionview/src/org/simantics/selectionview/DisplayValueVariableAdapter.java
index 2eaba75d6..7d90d3392 100644
--- a/bundles/org.simantics.selectionview/src/org/simantics/selectionview/DisplayValueVariableAdapter.java
+++ b/bundles/org.simantics.selectionview/src/org/simantics/selectionview/DisplayValueVariableAdapter.java
@@ -31,6 +31,7 @@ import org.simantics.db.layer0.variable.Variable;
 import org.simantics.db.layer0.variable.Variables;
 import org.simantics.layer0.Layer0;
 import org.simantics.modeling.ModelingResources;
+import org.simantics.scl.runtime.function.Function1;
 
 public class DisplayValueVariableAdapter extends SimpleContextualAdapter<Variable, ModelledVariablePropertyDescriptor> {
 	
@@ -117,20 +118,28 @@ public class DisplayValueVariableAdapter extends SimpleContextualAdapter<Variabl
     	String expression = possibleExpression(graph, property);
     	if(expression != null) return expression;
     	
-    	Object value = property.getValue(graph);
+    	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(value);
-    	} else {
+    		value = fmt.format(property.getValue(graph));
+    	}
+    	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) {
 
     		Datatype dt = property.getPossibleDatatype(graph);
     		if(dt != null) {
     			if(!isPrimitive(dt)) {
     				Binding binding = Bindings.getBinding(dt);
     				try {
-    					value = DataValuePrinter.writeValueSingleLine(binding, value);
+    					value = DataValuePrinter.writeValueSingleLine(binding, property.getValue(graph));
     				} catch (IOException e) {
     					e.printStackTrace();
     				} catch (BindingException e) {