diff options
author | Stéphane Bégaudeau | 2016-09-01 07:56:40 +0000 |
---|---|---|
committer | Stéphane Bégaudeau | 2016-09-07 08:55:04 +0000 |
commit | 7c49d5d606123487c19bcc29b3b23c45748ff2c6 (patch) | |
tree | e5025cf354a5447f76f7f48b88601761ddc82f53 /plugins/org.eclipse.eef.core | |
parent | 8a8e954a2c83bdb52528947c0aff133a9f2deee1 (diff) | |
download | org.eclipse.eef-7c49d5d606123487c19bcc29b3b23c45748ff2c6.tar.gz org.eclipse.eef-7c49d5d606123487c19bcc29b3b23c45748ff2c6.tar.xz org.eclipse.eef-7c49d5d606123487c19bcc29b3b23c45748ff2c6.zip |
[500472] Add support for widget actions on label and hyperlink
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=500472
Change-Id: I7b7a6a39c3974de996b7753a8fbdde79e97f73dd
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.eef.core')
5 files changed, 111 insertions, 5 deletions
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/EEFControllersFactory.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/EEFControllersFactory.java index d5411e830..fdadcf6a5 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/EEFControllersFactory.java +++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/EEFControllersFactory.java @@ -83,10 +83,13 @@ public class EEFControllersFactory { * The variable manager * @param interpreter * The interpreter + * @param contextAdapter + * The context adapter * @return A label controller */ - public IEEFLabelController createLabelController(EEFLabelDescription description, IVariableManager variableManager, IInterpreter interpreter) { - return new EEFLabelController(description, variableManager, interpreter); + public IEEFLabelController createLabelController(EEFLabelDescription description, IVariableManager variableManager, IInterpreter interpreter, + EditingContextAdapter contextAdapter) { + return new EEFLabelController(description, variableManager, interpreter, contextAdapter); } /** diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFHyperlinkController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFHyperlinkController.java index 888b5b1e1..12d55f99d 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFHyperlinkController.java +++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFHyperlinkController.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.eef.core.api.controllers; +import org.eclipse.eef.EEFWidgetAction; + /** * The EEFHyperlinkController is responsible of supporting all the interactions with the widgets created for an * EEFHyperlinkDescription. @@ -39,4 +41,12 @@ public interface IEEFHyperlinkController extends IEEFWidgetController { */ void removeNewValueConsumer(); + /** + * Invoked when the user clicks on an action button. + * + * @param action + * Widget action + */ + void action(EEFWidgetAction action); + } diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFLabelController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFLabelController.java index 06687ef2d..6eb917517 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFLabelController.java +++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFLabelController.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.eef.core.api.controllers; +import org.eclipse.eef.EEFWidgetAction; + /** * The EEFLabelController is responsible of supporting all the interactions with the widgets created for an * EEFLabelDescription. @@ -29,4 +31,12 @@ public interface IEEFLabelController extends IEEFWidgetController { * Remove the consumer of the new value of the label. */ void removeNewValueConsumer(); + + /** + * Invoked when the user clicks on an action button. + * + * @param action + * Widget action + */ + void action(EEFWidgetAction action); } diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFHyperlinkController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFHyperlinkController.java index 3d3cc5d0c..90ebe71e9 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFHyperlinkController.java +++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFHyperlinkController.java @@ -14,8 +14,10 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.eef.EEFHyperlinkDescription; +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; @@ -76,7 +78,17 @@ public class EEFHyperlinkController extends AbstractEEFWidgetController implemen 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()); + } } /** @@ -131,4 +143,25 @@ public class EEFHyperlinkController extends AbstractEEFWidgetController implemen return this.description; } + /** + * {@inheritDoc} + * + * @see org.eclipse.eef.core.api.controllers.IEEFHyperlinkController#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(EEFHyperlinkController.this.variableManager.getVariables()); + + EvalFactory.of(EEFHyperlinkController.this.interpreter, variables).logIfBlank(eAttribute).call(expression); + } + }); + } + } 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); + } + }); + } + } |