1 files changed, 52 insertions, 2 deletions

diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFLabelController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFLabelController.java
index c81d58b66..5dd4cf8b3 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFLabelController.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFLabelController.java
@@ -10,11 +10,21 @@
  *******************************************************************************/
 package org.eclipse.eef.core.internal.controllers;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.eclipse.eef.EEFLabelDescription;
+import org.eclipse.eef.EEFWidgetAction;
 import org.eclipse.eef.EEFWidgetDescription;
+import org.eclipse.eef.EefPackage;
+import org.eclipse.eef.common.api.utils.Util;
+import org.eclipse.eef.core.api.EEFExpressionUtils;
+import org.eclipse.eef.core.api.EditingContextAdapter;
 import org.eclipse.eef.core.api.controllers.AbstractEEFWidgetController;
 import org.eclipse.eef.core.api.controllers.IConsumer;
 import org.eclipse.eef.core.api.controllers.IEEFLabelController;
+import org.eclipse.eef.core.api.utils.EvalFactory;
+import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.sirius.common.interpreter.api.IInterpreter;
 import org.eclipse.sirius.common.interpreter.api.IVariableManager;
 
@@ -30,6 +40,11 @@ public class EEFLabelController extends AbstractEEFWidgetController implements I
 	private EEFLabelDescription description;
 
 	/**
+	 * The editing context adapter.
+	 */
+	private EditingContextAdapter contextAdapter;
+
+	/**
 	 * The consumer of the new body.
 	 */
 	private IConsumer<String> newValueConsumer;
@@ -43,10 +58,14 @@ public class EEFLabelController extends AbstractEEFWidgetController implements I
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
+	 * @param contextAdapter
+	 *            The editing context adapter
 	 */
-	public EEFLabelController(EEFLabelDescription description, IVariableManager variableManager, IInterpreter interpreter) {
+	public EEFLabelController(EEFLabelDescription description, IVariableManager variableManager, IInterpreter interpreter,
+			EditingContextAdapter contextAdapter) {
 		super(variableManager, interpreter);
 		this.description = description;
+		this.contextAdapter = contextAdapter;
 	}
 
 	/**
@@ -60,7 +79,17 @@ public class EEFLabelController extends AbstractEEFWidgetController implements I
 		super.refresh();
 
 		String valueExpression = this.description.getValueExpression();
-		this.newEval().logIfInvalidType(String.class).call(valueExpression, this.newValueConsumer);
+		Object valueExpressionResult = this.newEval().evaluate(valueExpression);
+
+		String displayExpression = this.description.getDisplayExpression();
+		if (!Util.isBlank(displayExpression)) {
+			Map<String, Object> variables = new HashMap<String, Object>();
+			variables.putAll(this.variableManager.getVariables());
+			variables.put(EEFExpressionUtils.EEFReference.VALUE, valueExpressionResult);
+			EvalFactory.of(this.interpreter, variables).logIfInvalidType(String.class).call(displayExpression, this.newValueConsumer);
+		} else if (valueExpressionResult != null) {
+			this.newValueConsumer.apply(valueExpressionResult.toString());
+		}
 	}
 
 	/**
@@ -93,4 +122,25 @@ public class EEFLabelController extends AbstractEEFWidgetController implements I
 		this.newValueConsumer = null;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.eef.core.api.controllers.IEEFLabelController#action(EEFWidgetAction)
+	 */
+	@Override
+	public void action(final EEFWidgetAction action) {
+		this.contextAdapter.performModelChange(new Runnable() {
+			@Override
+			public void run() {
+				String expression = action.getActionExpression();
+				EAttribute eAttribute = EefPackage.Literals.EEF_WIDGET_ACTION__ACTION_EXPRESSION;
+
+				Map<String, Object> variables = new HashMap<String, Object>();
+				variables.putAll(EEFLabelController.this.variableManager.getVariables());
+
+				EvalFactory.of(EEFLabelController.this.interpreter, variables).logIfBlank(eAttribute).call(expression);
+			}
+		});
+	}
+
 }