From 8d9659a857fb83a9fdb5c9c8663302765fddd3e8 Mon Sep 17 00:00:00 2001
From: Antti Villberg <antti.villberg@semantum.fi>
Date: Wed, 26 Sep 2018 09:31:36 +0200
Subject: [PATCH 1/1] String formatter property using SCL function instead of
 adapter

gitlab #135

Change-Id: Ibecb72ea24a00112c49b8f381ad1fd9b7eee438f
---
 .../graph/Selectionview.pgraph                  |  1 +
 .../DisplayValueVariableAdapter.java            | 17 +++++++++++++----
 .../simantics/selectionview/function/All.java   | 15 +++++++++++----
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph b/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
index 4bfeebffa..861f705d7 100644
--- a/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
+++ b/bundles/org.simantics.selectionview.ontology/graph/Selectionview.pgraph
@@ -48,6 +48,7 @@ SEL.TypedVariableTabContribution <T SEL.VariableTabContribution
 SEL.HasDisplayColumn <R L0.HasProperty : L0.FunctionalRelation
 
 SEL.HasFormatter <R L0.HasProperty : L0X.ResourcePropertyRelation
+SEL.formatter ==> "Dynamic -> String" <R L0.HasProperty
 
 SEL.HasDisplayProperty <R L0.HasProperty : L0.FunctionalRelation
   L0.RequiresValueType "String"
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) {
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..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;
@@ -451,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();	
-- 
2.43.2