[511205] Quick fixes are not executed using the EditingContextAdapter

All the controller are now requiring an editing context adapter in order
to use it to execute quick fixes.

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=511205
Change-Id: Ib1c7db0eb4321a9010a90f972521249f8d50bfa3
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>

42 files changed, 351 insertions, 265 deletions

diff --git a/doc/org.eclipse.eef.documentation/pages/releasenotes.html b/doc/org.eclipse.eef.documentation/pages/releasenotes.html
index 95b5348b3..ae5aefd38 100644
--- a/doc/org.eclipse.eef.documentation/pages/releasenotes.html
+++ b/doc/org.eclipse.eef.documentation/pages/releasenotes.html
@@ -12,6 +12,12 @@
 				<a href="#ReleaseNotesforEclipseEEF">Release Notes for Eclipse EEF</a>
 				<ol style="list-style: disc;">
 					<li>
+						<a href="#eef2.0.0">Changes in EEF 2.0.0</a>
+					</li>
+					<li>
+						<a href="#eef1.9.0">Changes in EEF 1.9.0</a>
+					</li>
+					<li>
 						<a href="#eef1.8.0">Changes in EEF 1.8.0</a>
 					</li>
 					<li>
@@ -36,12 +42,24 @@
 			</li>
 		</ol>
 		<p>This document contains the release notes for recent major releases of EEF.</p>
+		<h3 id="eef2.0.0">Changes in EEF 2.0.0</h3>
+		<h4 id="DeveloperVisibleChanges">Developer-Visible Changes</h4>
+		<ul>
+			<li><span class="label label-info">Modified</span> The class 
+				<code>org.eclipse.eef.core.api.controllers.AbstractEEFController</code> and all its subclasses now require an EditingContextAdapter.
+			</li>
+		</ul>
+		<h3 id="eef1.9.0">Changes in EEF 1.9.0</h3>
+		<h4 id="UserVisibleChanges">User-Visible Changes</h4>
+		<ul>
+			<li><span class="label label-success">Added</span> Add support for permissions with locks</li>
+		</ul>
 		<h3 id="eef1.8.0">Changes in EEF 1.8.0</h3>
 		<h4 id="SpecifierVisibleChanges">Specifier-Visible Changes</h4>
 		<ul>
 			<li><span class="label label-info">Modified</span> The selection variable of the hyperlink widget now refers properly to the value of the hyperlink.</li>
 		</ul>
-		<h4 id="DeveloperVisibleChanges">Developer-Visible Changes</h4>
+		<h4 id="DeveloperVisibleChanges2">Developer-Visible Changes</h4>
 		<ul>
 			<li><span class="label label-info">Modified</span> The interfaces of the controllers for the default widget will now return an IStatus in order to support potential issues after the execution of the callback.</li>
 		</ul>
@@ -59,13 +77,13 @@
 			</li>
 			<li><span class="label label-info">Modified</span> Improve the documentation of the available extension points</li>
 		</ul>
-		<h4 id="DeveloperVisibleChanges2">Developer-Visible Changes</h4>
+		<h4 id="DeveloperVisibleChanges3">Developer-Visible Changes</h4>
 		<ul>
 			<li><span class="label label-success">Added</span> Added the documentation of the IEEFTabDescriptorFilter and IEEFExtReferenceViewerFilterProvider extension points.</li>
 			<li><span class="label label-info">Modified</span> Revert the lazy evaluation of the candidates of the select widget.</li>
 		</ul>
 		<h3 id="eef1.7.0">Changes in EEF 1.7.0</h3>
-		<h4 id="UserVisibleChanges">User-Visible Changes</h4>
+		<h4 id="UserVisibleChanges2">User-Visible Changes</h4>
 		<ul>
 			<li><span class="label label-success">Added</span> Labels and hyperlinks can now have buttons on their right side.</li>
 			<li><span class="label label-info">Modified</span> Trigger the 
@@ -85,7 +103,7 @@
 			<li><span class="label label-info">Modified</span> The edit operation of a mono-line text field can now be triggered by pressing enter.</li>
 			<li><span class="label label-info">Modified</span> A selection variable is available in the hyperlink widget, it is equals to the value of the hyperlink instead of self.</li>
 		</ul>
-		<h4 id="DeveloperVisibleChanges3">Developer-Visible Changes</h4>
+		<h4 id="DeveloperVisibleChanges4">Developer-Visible Changes</h4>
 		<ul>
 			<li><span class="label label-info">Modified</span> The interface 
 				<code>org.eclipse.eef.core.api.EditingContextAdapter</code> has now a new method 
@@ -95,7 +113,7 @@
 			<li><span class="label label-success">Added</span> The class EEFStyleHelper is now API in order to help support style and conditional styles for custom widgets. Developers will need to override org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager.getEEFStyleHelper() to provide their own implementation. The easiest way will need to extend the regular implementation and modify the three switchs to provide using the dedicated getters.</li>
 		</ul>
 		<h3 id="eef1.6.2">Changes in EEF 1.6.2</h3>
-		<h4 id="UserVisibleChanges2">User-Visible Changes</h4>
+		<h4 id="UserVisibleChanges3">User-Visible Changes</h4>
 		<ul>
 			<li><span class="label label-info">Modified</span> Trigger the 
 				<code>editExpression</code> of a text widget on focus lost.
@@ -108,7 +126,7 @@
 			<li><span class="label label-info">Modified</span> Fixed an issue the refresh of the Properties view with an EMF proxy</li>
 		</ul>
 		<h3 id="eef1.6.0">Changes in EEF 1.6.0</h3>
-		<h4 id="UserVisibleChanges3">User-Visible Changes</h4>
+		<h4 id="UserVisibleChanges4">User-Visible Changes</h4>
 		<ul>
 			<li><span class="label label-success">Added</span> The user interface has been recreated from scratch with a new runtime. As a result multiple changes can be visible in the user interface.</li>
 		</ul>
@@ -118,7 +136,7 @@
 				<a href="language/overview.html">language</a> is available to create your user interface. Have a look at the documentation for additional details.
 			</li>
 		</ul>
-		<h4 id="DeveloperVisibleChanges4">Developer-Visible Changes</h4>
+		<h4 id="DeveloperVisibleChanges5">Developer-Visible Changes</h4>
 		<ul>
 			<li><span class="label label-success">Added</span> A brand new API is available to create your user interface. Have a look at the documentation for additional details.</li>
 		</ul>
diff --git a/doc/org.eclipse.eef.documentation/pages/releasenotes.textile b/doc/org.eclipse.eef.documentation/pages/releasenotes.textile
index c8455ccdb..230db6f3f 100644
--- a/doc/org.eclipse.eef.documentation/pages/releasenotes.textile
+++ b/doc/org.eclipse.eef.documentation/pages/releasenotes.textile
@@ -4,6 +4,17 @@ h2. Release Notes for Eclipse EEF
 
 This document contains the release notes for recent major releases of EEF.
 
+h3(#eef2.0.0). Changes in EEF 2.0.0
+
+h4. Developer-Visible Changes
+
+* <span class="label label-info">Modified</span> The class @org.eclipse.eef.core.api.controllers.AbstractEEFController@ and all its subclasses now require an EditingContextAdapter.
+
+h3(#eef1.9.0). Changes in EEF 1.9.0
+
+h4. User-Visible Changes
+
+* <span class="label label-success">Added</span> Add support for permissions with locks
 
 h3(#eef1.8.0). Changes in EEF 1.8.0
 
diff --git a/plugins/org.eclipse.eef.core.ext.widgets.reference/src/org/eclipse/eef/core/ext/widgets/reference/internal/EEFExtReferenceController.java b/plugins/org.eclipse.eef.core.ext.widgets.reference/src/org/eclipse/eef/core/ext/widgets/reference/internal/EEFExtReferenceController.java
index 6d3b7a969..c864ae087 100644
--- a/plugins/org.eclipse.eef.core.ext.widgets.reference/src/org/eclipse/eef/core/ext/widgets/reference/internal/EEFExtReferenceController.java
+++ b/plugins/org.eclipse.eef.core.ext.widgets.reference/src/org/eclipse/eef/core/ext/widgets/reference/internal/EEFExtReferenceController.java
@@ -11,6 +11,7 @@
 package org.eclipse.eef.core.ext.widgets.reference.internal;
 
 import org.eclipse.eef.EEFWidgetDescription;
+import org.eclipse.eef.core.api.EditingContextAdapter;
 import org.eclipse.eef.core.api.controllers.AbstractEEFWidgetController;
 import org.eclipse.eef.ext.widgets.reference.eefextwidgetsreference.EEFExtReferenceDescription;
 import org.eclipse.sirius.common.interpreter.api.IInterpreter;
@@ -37,9 +38,12 @@ public class EEFExtReferenceController extends AbstractEEFWidgetController {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
+	 * @param editingContextAdapter
+	 *            The editing context adapter
 	 */
-	public EEFExtReferenceController(EEFExtReferenceDescription description, IVariableManager variableManager, IInterpreter interpreter) {
-		super(variableManager, interpreter);
+	public EEFExtReferenceController(EEFExtReferenceDescription description, IVariableManager variableManager, IInterpreter interpreter,
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
 	}
 
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/AbstractEEFController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/AbstractEEFController.java
index e4ab2ae1d..c812e6f54 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/AbstractEEFController.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/AbstractEEFController.java
@@ -20,6 +20,7 @@ import org.eclipse.eef.EEFRuleAuditDescription;
 import org.eclipse.eef.EEFValidationRuleDescription;
 import org.eclipse.eef.EefPackage;
 import org.eclipse.eef.core.api.EEFExpressionUtils;
+import org.eclipse.eef.core.api.EditingContextAdapter;
 import org.eclipse.eef.core.api.utils.EvalFactory;
 import org.eclipse.eef.core.api.utils.EvalFactory.Eval;
 import org.eclipse.eef.core.internal.controllers.InvalidValidationRuleResult;
@@ -48,6 +49,11 @@ public abstract class AbstractEEFController implements IEEFController {
 	protected IVariableManager variableManager;
 
 	/**
+	 * The editing context adapter.
+	 */
+	protected EditingContextAdapter editingContextAdapter;
+
+	/**
 	 * The consumer of the validation messages.
 	 */
 	private IConsumer<List<IValidationRuleResult>> validationConsumer;
@@ -59,10 +65,13 @@ public abstract class AbstractEEFController implements IEEFController {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
+	 * @param editingContextAdapter
+	 *            The editing context adapter
 	 */
-	public AbstractEEFController(IVariableManager variableManager, IInterpreter interpreter) {
+	public AbstractEEFController(IVariableManager variableManager, IInterpreter interpreter, EditingContextAdapter editingContextAdapter) {
 		this.variableManager = variableManager;
 		this.interpreter = interpreter;
+		this.editingContextAdapter = editingContextAdapter;
 	}
 
 	/**
@@ -169,7 +178,8 @@ public abstract class AbstractEEFController implements IEEFController {
 				Eval<Object> eval = EvalFactory.of(this.interpreter, variables);
 				String message = eval.logIfBlank(messageEAttribute).logIfInvalidType(String.class).evaluate(validationRule.getMessageExpression());
 
-				validationRuleResults.add(new InvalidValidationRuleResult(validationRule, message, eval, validationRule.getSeverity().getValue()));
+				validationRuleResults.add(new InvalidValidationRuleResult(validationRule, message, eval, this.editingContextAdapter,
+						validationRule.getSeverity().getValue()));
 			}
 		}
 
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/AbstractEEFCustomWidgetController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/AbstractEEFCustomWidgetController.java
index 5f5cdbfae..589a606e6 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/AbstractEEFCustomWidgetController.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/AbstractEEFCustomWidgetController.java
@@ -34,11 +34,6 @@ public abstract class AbstractEEFCustomWidgetController extends AbstractEEFWidge
 	protected EEFCustomWidgetDescription description;
 
 	/**
-	 * The editing context adapter.
-	 */
-	protected EditingContextAdapter contextAdapter;
-
-	/**
 	 * The constructor.
 	 *
 	 * @param description
@@ -52,9 +47,8 @@ public abstract class AbstractEEFCustomWidgetController extends AbstractEEFWidge
 	 */
 	public AbstractEEFCustomWidgetController(EEFCustomWidgetDescription description, IVariableManager variableManager, IInterpreter interpreter,
 			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter);
+		super(variableManager, interpreter, contextAdapter);
 		this.description = description;
-		this.contextAdapter = contextAdapter;
 	}
 
 	/**
@@ -95,7 +89,7 @@ public abstract class AbstractEEFCustomWidgetController extends AbstractEEFWidge
 	 *            Identifier of the custom expression to execute
 	 */
 	protected void executeCommandExpression(final String customExpressionId) {
-		contextAdapter.performModelChange(new Runnable() {
+		this.editingContextAdapter.performModelChange(new Runnable() {
 			@Override
 			public void run() {
 				String pushExpression = getCustomExpression(customExpressionId);
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/AbstractEEFWidgetController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/AbstractEEFWidgetController.java
index e9138f0c2..8eabc21df 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/AbstractEEFWidgetController.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/AbstractEEFWidgetController.java
@@ -12,6 +12,7 @@ package org.eclipse.eef.core.api.controllers;
 
 import org.eclipse.eef.EEFWidgetDescription;
 import org.eclipse.eef.EefPackage;
+import org.eclipse.eef.core.api.EditingContextAdapter;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.sirius.common.interpreter.api.IInterpreter;
@@ -41,9 +42,11 @@ public abstract class AbstractEEFWidgetController extends AbstractEEFController
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
+	 * @param editingContextAdapter
+	 *            The editing context adapter
 	 */
-	public AbstractEEFWidgetController(IVariableManager variableManager, IInterpreter interpreter) {
-		super(variableManager, interpreter);
+	public AbstractEEFWidgetController(IVariableManager variableManager, IInterpreter interpreter, EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 	}
 
 	/**
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 1edaa6ae3..713338c59 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
@@ -50,10 +50,13 @@ public class EEFControllersFactory {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
+	 * @param editingContextAdapter
+	 *            The editing context adapter
 	 * @return The group controller
 	 */
-	public IEEFGroupController createGroupController(EEFGroupDescription description, IVariableManager variableManager, IInterpreter interpreter) {
-		return new EEFGroupController(description, variableManager, interpreter);
+	public IEEFGroupController createGroupController(EEFGroupDescription description, IVariableManager variableManager, IInterpreter interpreter,
+			EditingContextAdapter editingContextAdapter) {
+		return new EEFGroupController(description, variableManager, interpreter, editingContextAdapter);
 	}
 
 	/**
@@ -65,13 +68,13 @@ public class EEFControllersFactory {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 * @return A text controller
 	 */
 	public IEEFTextController createTextController(EEFTextDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		return new EEFTextController(description, variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		return new EEFTextController(description, variableManager, interpreter, editingContextAdapter);
 	}
 
 	/**
@@ -83,13 +86,13 @@ public class EEFControllersFactory {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The context adapter
 	 * @return A label controller
 	 */
 	public IEEFLabelController createLabelController(EEFLabelDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		return new EEFLabelController(description, variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		return new EEFLabelController(description, variableManager, interpreter, editingContextAdapter);
 	}
 
 	/**
@@ -101,13 +104,13 @@ public class EEFControllersFactory {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 * @return A button controller
 	 */
 	public IEEFButtonController createButtonController(EEFButtonDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		return new EEFButtonController(description, variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		return new EEFButtonController(description, variableManager, interpreter, editingContextAdapter);
 	}
 
 	/**
@@ -119,13 +122,13 @@ public class EEFControllersFactory {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 * @return A label controller
 	 */
 	public IEEFSelectController createSelectController(EEFSelectDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		return new EEFSelectController(description, variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		return new EEFSelectController(description, variableManager, interpreter, editingContextAdapter);
 	}
 
 	/**
@@ -137,13 +140,13 @@ public class EEFControllersFactory {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 * @return A checkbox controller
 	 */
 	public IEEFCheckboxController createCheckboxController(EEFCheckboxDescription description, IVariableManager variableManager,
-			IInterpreter interpreter, EditingContextAdapter contextAdapter) {
-		return new EEFCheckboxController(description, variableManager, interpreter, contextAdapter);
+			IInterpreter interpreter, EditingContextAdapter editingContextAdapter) {
+		return new EEFCheckboxController(description, variableManager, interpreter, editingContextAdapter);
 
 	}
 
@@ -156,13 +159,13 @@ public class EEFControllersFactory {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 * @return A radio controller
 	 */
 	public IEEFRadioController createRadioController(EEFRadioDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		return new EEFRadioController(description, variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		return new EEFRadioController(description, variableManager, interpreter, editingContextAdapter);
 	}
 
 	/**
@@ -174,10 +177,13 @@ public class EEFControllersFactory {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
+	 * @param editingContextAdapter
+	 *            The editing context adapter
 	 * @return The section controller.
 	 */
-	public IEEFSectionController createSectionController(EEFPageDescription description, IVariableManager variableManager, IInterpreter interpreter) {
-		return new EEFSectionController(variableManager, interpreter, description);
+	public IEEFSectionController createSectionController(EEFPageDescription description, IVariableManager variableManager, IInterpreter interpreter,
+			EditingContextAdapter editingContextAdapter) {
+		return new EEFSectionController(variableManager, interpreter, description, editingContextAdapter);
 	}
 
 	/**
@@ -189,13 +195,13 @@ public class EEFControllersFactory {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 * @return The list controller.
 	 */
 	public IEEFListController createListController(EEFListDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		return new EEFListController(variableManager, interpreter, description, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		return new EEFListController(variableManager, interpreter, description, editingContextAdapter);
 	}
 
 	/**
@@ -207,12 +213,12 @@ public class EEFControllersFactory {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 * @return A hyperlink controller
 	 */
 	public IEEFHyperlinkController createHyperlinkController(EEFHyperlinkDescription description, IVariableManager variableManager,
-			IInterpreter interpreter, EditingContextAdapter contextAdapter) {
-		return new EEFHyperlinkController(description, variableManager, interpreter, contextAdapter);
+			IInterpreter interpreter, EditingContextAdapter editingContextAdapter) {
+		return new EEFHyperlinkController(description, variableManager, interpreter, editingContextAdapter);
 	}
 }
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IInvalidValidationRuleResult.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IInvalidValidationRuleResult.java
index 0ece8198f..02dea9e1c 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IInvalidValidationRuleResult.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IInvalidValidationRuleResult.java
@@ -44,7 +44,7 @@ public interface IInvalidValidationRuleResult extends IValidationRuleResult {
 	 *
 	 * @return The data related to this invalid result
 	 */
-	Object getData();
+	InvalidValidationRuleResultData getData();
 
 	/**
 	 * Returns the severity.
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/InvalidValidationRuleResultData.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/InvalidValidationRuleResultData.java
new file mode 100644
index 000000000..88b02af79
--- /dev/null
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/InvalidValidationRuleResultData.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.eef.core.api.controllers;
+
+import org.eclipse.eef.core.api.EditingContextAdapter;
+import org.eclipse.eef.core.api.utils.EvalFactory.Eval;
+
+/**
+ * Utility class holding the data of the invalid validation rule result.
+ *
+ * @author sbegaudeau
+ */
+public class InvalidValidationRuleResultData {
+
+	/**
+	 * The evaluation environment.
+	 */
+	private Eval<Object> eval;
+
+	/**
+	 * The editing context adapter.
+	 */
+	private EditingContextAdapter editingContextAdapter;
+
+	/**
+	 * The constructor.
+	 *
+	 * @param eval
+	 *            The evaluation environment
+	 * @param editingContextAdapter
+	 *            The editong context adapter
+	 */
+	public InvalidValidationRuleResultData(Eval<Object> eval, EditingContextAdapter editingContextAdapter) {
+		this.eval = eval;
+		this.editingContextAdapter = editingContextAdapter;
+	}
+
+	/**
+	 * Return the eval.
+	 *
+	 * @return the eval
+	 */
+	public Eval<Object> getEval() {
+		return this.eval;
+	}
+
+	/**
+	 * Return the editingContextAdapter.
+	 *
+	 * @return the editingContextAdapter
+	 */
+	public EditingContextAdapter getEditingContextAdapter() {
+		return this.editingContextAdapter;
+	}
+
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFButtonController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFButtonController.java
index ac111545f..8a5a40ab2 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFButtonController.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFButtonController.java
@@ -34,11 +34,6 @@ public class EEFButtonController extends AbstractEEFWidgetController implements
 	private EEFButtonDescription description;
 
 	/**
-	 * The editing context adapter.
-	 */
-	private EditingContextAdapter contextAdapter;
-
-	/**
 	 * The consumer of a new value of the button's label.
 	 */
 	private IConsumer<String> newButtonLabelConsumer;
@@ -52,14 +47,13 @@ public class EEFButtonController extends AbstractEEFWidgetController implements
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFButtonController(EEFButtonDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
-		this.contextAdapter = contextAdapter;
 	}
 
 	@Override
@@ -87,7 +81,7 @@ public class EEFButtonController extends AbstractEEFWidgetController implements
 
 	@Override
 	public IStatus pushed() {
-		return contextAdapter.performModelChange(() -> {
+		return this.editingContextAdapter.performModelChange(() -> {
 			String pushExpression = this.description.getPushExpression();
 			EAttribute attr = EefPackage.Literals.EEF_BUTTON_DESCRIPTION__PUSH_EXPRESSION;
 			this.newEval().logIfBlank(attr).call(pushExpression);
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFCheckboxController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFCheckboxController.java
index c92bfb54a..3a50029b9 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFCheckboxController.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFCheckboxController.java
@@ -39,11 +39,6 @@ public class EEFCheckboxController extends AbstractEEFWidgetController implement
 	private EEFCheckboxDescription description;
 
 	/**
-	 * The editing context adapter.
-	 */
-	private EditingContextAdapter contextAdapter;
-
-	/**
 	 * The consumer of a new value of the checkbox.
 	 */
 	private IConsumer<Boolean> newValueConsumer;
@@ -57,19 +52,18 @@ public class EEFCheckboxController extends AbstractEEFWidgetController implement
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFCheckboxController(EEFCheckboxDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
-		this.contextAdapter = contextAdapter;
 	}
 
 	@Override
 	public IStatus updateValue(final boolean checkbox) {
-		return contextAdapter.performModelChange(() -> {
+		return this.editingContextAdapter.performModelChange(() -> {
 			String editExpression = this.description.getEditExpression();
 			EAttribute eAttribute = EefPackage.Literals.EEF_CHECKBOX_DESCRIPTION__EDIT_EXPRESSION;
 
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFGroupController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFGroupController.java
index 3d30efd5e..74e1f28a6 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFGroupController.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFGroupController.java
@@ -12,6 +12,7 @@ package org.eclipse.eef.core.internal.controllers;
 
 import org.eclipse.eef.EEFGroupDescription;
 import org.eclipse.eef.EefPackage;
+import org.eclipse.eef.core.api.EditingContextAdapter;
 import org.eclipse.eef.core.api.controllers.AbstractEEFController;
 import org.eclipse.eef.core.api.controllers.IConsumer;
 import org.eclipse.eef.core.api.controllers.IEEFGroupController;
@@ -46,9 +47,12 @@ public class EEFGroupController extends AbstractEEFController implements IEEFGro
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
+	 * @param editingContextAdapter
+	 *            The editing context adapter
 	 */
-	public EEFGroupController(EEFGroupDescription description, IVariableManager variableManager, IInterpreter interpreter) {
-		super(variableManager, interpreter);
+	public EEFGroupController(EEFGroupDescription description, IVariableManager variableManager, IInterpreter interpreter,
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
 	}
 
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 c246c2b23..06ad3c1b1 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
@@ -43,11 +43,6 @@ public class EEFHyperlinkController extends AbstractEEFWidgetController implemen
 	private EEFHyperlinkDescription description;
 
 	/**
-	 * The editing context adapter.
-	 */
-	private EditingContextAdapter contextAdapter;
-
-	/**
 	 * The consumer of a new value of the text.
 	 */
 	private IConsumer<Object> newValueConsumer;
@@ -61,14 +56,13 @@ public class EEFHyperlinkController extends AbstractEEFWidgetController implemen
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFHyperlinkController(EEFHyperlinkDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
-		this.contextAdapter = contextAdapter;
 	}
 
 	/**
@@ -110,7 +104,7 @@ public class EEFHyperlinkController extends AbstractEEFWidgetController implemen
 	 */
 	@Override
 	public IStatus onClick(final Object element) {
-		return contextAdapter.performModelChange(() -> {
+		return this.editingContextAdapter.performModelChange(() -> {
 			String expression = this.description.getOnClickExpression();
 			EAttribute attr = EefPackage.Literals.EEF_HYPERLINK_DESCRIPTION__ON_CLICK_EXPRESSION;
 
@@ -159,7 +153,7 @@ public class EEFHyperlinkController extends AbstractEEFWidgetController implemen
 	 */
 	@Override
 	public IStatus action(final EEFWidgetAction action) {
-		return this.contextAdapter.performModelChange(() -> {
+		return this.editingContextAdapter.performModelChange(() -> {
 			String expression = action.getActionExpression();
 			EAttribute eAttribute = EefPackage.Literals.EEF_WIDGET_ACTION__ACTION_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 bd05793f0..8f6b92a92 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
@@ -41,11 +41,6 @@ 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;
@@ -59,14 +54,13 @@ public class EEFLabelController extends AbstractEEFWidgetController implements I
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFLabelController(EEFLabelDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
-		this.contextAdapter = contextAdapter;
 	}
 
 	/**
@@ -130,7 +124,7 @@ public class EEFLabelController extends AbstractEEFWidgetController implements I
 	 */
 	@Override
 	public IStatus action(final EEFWidgetAction action) {
-		return this.contextAdapter.performModelChange(() -> {
+		return this.editingContextAdapter.performModelChange(() -> {
 			String expression = action.getActionExpression();
 			EAttribute eAttribute = EefPackage.Literals.EEF_WIDGET_ACTION__ACTION_EXPRESSION;
 
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFListController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFListController.java
index e2ad71bc4..21aa00ed2 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFListController.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFListController.java
@@ -41,11 +41,6 @@ public class EEFListController extends AbstractEEFWidgetController implements IE
 	private EEFListDescription description;
 
 	/**
-	 * The editing context adapter.
-	 */
-	private EditingContextAdapter contextAdapter;
-
-	/**
 	 * The consumer of a new value of the list.
 	 */
 	private IConsumer<Object> newValueConsumer;
@@ -59,14 +54,13 @@ public class EEFListController extends AbstractEEFWidgetController implements IE
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFListController(IVariableManager variableManager, IInterpreter interpreter, EEFListDescription description,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
-		this.contextAdapter = contextAdapter;
 	}
 
 	/**
@@ -109,7 +103,7 @@ public class EEFListController extends AbstractEEFWidgetController implements IE
 	 */
 	@Override
 	public void onClick(final Object element, final String onClickEventKind) {
-		contextAdapter.performModelChange(() -> {
+		this.editingContextAdapter.performModelChange(() -> {
 			String expression = this.description.getOnClickExpression();
 
 			Map<String, Object> variables = new HashMap<String, Object>();
@@ -139,7 +133,7 @@ public class EEFListController extends AbstractEEFWidgetController implements IE
 	 */
 	@Override
 	public IStatus action(final EEFWidgetAction action, final List<Object> elements) {
-		return contextAdapter.performModelChange(() -> {
+		return this.editingContextAdapter.performModelChange(() -> {
 			String expression = action.getActionExpression();
 			EAttribute eAttribute = EefPackage.Literals.EEF_WIDGET_ACTION__ACTION_EXPRESSION;
 
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFRadioController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFRadioController.java
index 0bb551121..a9c524c3f 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFRadioController.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFRadioController.java
@@ -41,11 +41,6 @@ public class EEFRadioController extends AbstractEEFWidgetController implements I
 	private EEFRadioDescription description;
 
 	/**
-	 * The editing context adapter.
-	 */
-	private EditingContextAdapter contextAdapter;
-
-	/**
 	 * The consumer of a new value of the combo.
 	 */
 	private IConsumer<Object> newValueConsumer;
@@ -64,19 +59,18 @@ public class EEFRadioController extends AbstractEEFWidgetController implements I
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFRadioController(EEFRadioDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
-		this.contextAdapter = contextAdapter;
 	}
 
 	@Override
 	public IStatus updateValue(final Object text) {
-		return contextAdapter.performModelChange(() -> {
+		return this.editingContextAdapter.performModelChange(() -> {
 			String editExpression = this.description.getEditExpression();
 			EAttribute eAttribute = EefPackage.Literals.EEF_RADIO_DESCRIPTION__EDIT_EXPRESSION;
 
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFSectionController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFSectionController.java
index 0a529f305..3f566d108 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFSectionController.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFSectionController.java
@@ -12,6 +12,7 @@ package org.eclipse.eef.core.internal.controllers;
 
 import org.eclipse.eef.EEFPageDescription;
 import org.eclipse.eef.EefPackage;
+import org.eclipse.eef.core.api.EditingContextAdapter;
 import org.eclipse.eef.core.api.controllers.AbstractEEFController;
 import org.eclipse.eef.core.api.controllers.IEEFSectionController;
 import org.eclipse.emf.ecore.EObject;
@@ -39,9 +40,12 @@ public class EEFSectionController extends AbstractEEFController implements IEEFS
 	 *            The interpreter
 	 * @param description
 	 *            The description of the page
+	 * @param editingContextAdapter
+	 *            The editing context adapter
 	 */
-	public EEFSectionController(IVariableManager variableManager, IInterpreter interpreter, EEFPageDescription description) {
-		super(variableManager, interpreter);
+	public EEFSectionController(IVariableManager variableManager, IInterpreter interpreter, EEFPageDescription description,
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
 	}
 
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFSelectController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFSelectController.java
index 703c5991a..018b2ab3d 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFSelectController.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFSelectController.java
@@ -43,11 +43,6 @@ public class EEFSelectController extends AbstractEEFWidgetController implements
 	private EEFSelectDescription description;
 
 	/**
-	 * The editing context adapter.
-	 */
-	private EditingContextAdapter contextAdapter;
-
-	/**
 	 * The consumer of a new value of the combo.
 	 */
 	private IConsumer<Object> newValueConsumer;
@@ -66,19 +61,18 @@ public class EEFSelectController extends AbstractEEFWidgetController implements
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFSelectController(EEFSelectDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
-		this.contextAdapter = contextAdapter;
 	}
 
 	@Override
 	public IStatus updateValue(final Object text) {
-		return contextAdapter.performModelChange(() -> {
+		return this.editingContextAdapter.performModelChange(() -> {
 			String editExpression = this.description.getEditExpression();
 			EAttribute eAttribute = EefPackage.Literals.EEF_SELECT_DESCRIPTION__EDIT_EXPRESSION;
 
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFTextController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFTextController.java
index 57ca68d3f..ecfd50de1 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFTextController.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFTextController.java
@@ -39,11 +39,6 @@ public class EEFTextController extends AbstractEEFWidgetController implements IE
 	private EEFTextDescription description;
 
 	/**
-	 * The editing context adapter.
-	 */
-	private EditingContextAdapter contextAdapter;
-
-	/**
 	 * The consumer of a new value of the text.
 	 */
 	private IConsumer<Object> newValueConsumer;
@@ -57,19 +52,18 @@ public class EEFTextController extends AbstractEEFWidgetController implements IE
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFTextController(EEFTextDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
-		this.contextAdapter = contextAdapter;
 	}
 
 	@Override
 	public IStatus updateValue(final String text) {
-		return this.contextAdapter.performModelChange(() -> {
+		return this.editingContextAdapter.performModelChange(() -> {
 			String editExpression = this.description.getEditExpression();
 			EAttribute eAttribute = EefPackage.Literals.EEF_TEXT_DESCRIPTION__EDIT_EXPRESSION;
 
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/InvalidValidationRuleResult.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/InvalidValidationRuleResult.java
index d72e22e27..34b8944fc 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/InvalidValidationRuleResult.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/InvalidValidationRuleResult.java
@@ -11,7 +11,10 @@
 package org.eclipse.eef.core.internal.controllers;
 
 import org.eclipse.eef.EEFValidationRuleDescription;
+import org.eclipse.eef.core.api.EditingContextAdapter;
 import org.eclipse.eef.core.api.controllers.IInvalidValidationRuleResult;
+import org.eclipse.eef.core.api.controllers.InvalidValidationRuleResultData;
+import org.eclipse.eef.core.api.utils.EvalFactory.Eval;
 
 /**
  * An invalid validation rule result.
@@ -26,9 +29,14 @@ public class InvalidValidationRuleResult extends ValidationRuleResult implements
 	private String message;
 
 	/**
-	 * The data.
+	 * The evaluation environment.
 	 */
-	private Object data;
+	private Eval<Object> eval;
+
+	/**
+	 * The editing context adapter.
+	 */
+	private EditingContextAdapter editingContextAdapter;
 
 	/**
 	 * The severity.
@@ -37,20 +45,24 @@ public class InvalidValidationRuleResult extends ValidationRuleResult implements
 
 	/**
 	 * The constructor.
-	 * 
+	 *
 	 * @param validationRule
 	 *            The validation rule
 	 * @param message
 	 *            The message
-	 * @param data
-	 *            The data
+	 * @param eval
+	 *            The evaluation environment
+	 * @param editingContextAdapter
+	 *            The editing context adapter
 	 * @param severity
 	 *            The severity
 	 */
-	public InvalidValidationRuleResult(EEFValidationRuleDescription validationRule, String message, Object data, int severity) {
+	public InvalidValidationRuleResult(EEFValidationRuleDescription validationRule, String message, Eval<Object> eval,
+			EditingContextAdapter editingContextAdapter, int severity) {
 		super(validationRule);
 		this.message = message;
-		this.data = data;
+		this.eval = eval;
+		this.editingContextAdapter = editingContextAdapter;
 		this.severity = severity;
 	}
 
@@ -70,8 +82,8 @@ public class InvalidValidationRuleResult extends ValidationRuleResult implements
 	 * @see org.eclipse.eef.core.api.controllers.IInvalidValidationRuleResult#getData()
 	 */
 	@Override
-	public Object getData() {
-		return this.data;
+	public InvalidValidationRuleResultData getData() {
+		return new InvalidValidationRuleResultData(this.eval, this.editingContextAdapter);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/AbstractEEFExtReferenceLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/AbstractEEFExtReferenceLifecycleManager.java
index ed5c4a8e2..bca933bbc 100644
--- a/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/AbstractEEFExtReferenceLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/AbstractEEFExtReferenceLifecycleManager.java
@@ -119,12 +119,12 @@ public abstract class AbstractEEFExtReferenceLifecycleManager extends AbstractEE
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The context adapter
 	 */
 	public AbstractEEFExtReferenceLifecycleManager(EEFExtReferenceDescription description, EObject target, EReference eReference,
-			IVariableManager variableManager, IInterpreter interpreter, EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter, contextAdapter);
+			IVariableManager variableManager, IInterpreter interpreter, EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
 		this.target = target;
 		this.eReference = eReference;
@@ -191,7 +191,7 @@ public abstract class AbstractEEFExtReferenceLifecycleManager extends AbstractEE
 	 * Initializes the browse button.
 	 */
 	private void initializeBrowseButton() {
-		this.browseButtonListener = new ButtonSelectionListener(this.contextAdapter, () -> this.browseButtonCallback());
+		this.browseButtonListener = new ButtonSelectionListener(this.editingContextAdapter, () -> this.browseButtonCallback());
 		this.browseButton.addSelectionListener(this.browseButtonListener);
 		this.browseButton.setToolTipText(Messages.ReferenceBrowseButton_tooltipText);
 	}
@@ -205,7 +205,7 @@ public abstract class AbstractEEFExtReferenceLifecycleManager extends AbstractEE
 	 * Initializes the add button.
 	 */
 	private void initializeAddButton() {
-		this.addButtonListener = new ButtonSelectionListener(this.contextAdapter, () -> this.addButtonCallback());
+		this.addButtonListener = new ButtonSelectionListener(this.editingContextAdapter, () -> this.addButtonCallback());
 		this.addButton.addSelectionListener(this.addButtonListener);
 		this.addButton.setToolTipText(Messages.ReferenceAddButton_tooltipText);
 	}
@@ -219,7 +219,7 @@ public abstract class AbstractEEFExtReferenceLifecycleManager extends AbstractEE
 	 * Initializes the remove button.
 	 */
 	private void initializeRemoveButton() {
-		this.removeButtonListener = new ButtonSelectionListener(this.contextAdapter, () -> this.removeButtonCallback());
+		this.removeButtonListener = new ButtonSelectionListener(this.editingContextAdapter, () -> this.removeButtonCallback());
 		this.removeButton.addSelectionListener(this.removeButtonListener);
 		if (this.eReference.isContainment()) {
 			this.removeButton.setToolTipText(Messages.ReferenceRemoveButton_containmentTooltipText);
@@ -338,7 +338,7 @@ public abstract class AbstractEEFExtReferenceLifecycleManager extends AbstractEE
 		/**
 		 * The context adapter.
 		 */
-		private EditingContextAdapter contextAdapter;
+		private EditingContextAdapter editingContextAdapter;
 
 		/**
 		 * The behavior to execute when the button is clicked.
@@ -348,13 +348,13 @@ public abstract class AbstractEEFExtReferenceLifecycleManager extends AbstractEE
 		/**
 		 * The constructor.
 		 *
-		 * @param contextAdapter
+		 * @param editingContextAdapter
 		 *            The {@link EditingContextAdapter}
 		 * @param runnable
 		 *            The behavior to execute when the button is clicked
 		 */
-		public ButtonSelectionListener(EditingContextAdapter contextAdapter, Runnable runnable) {
-			this.contextAdapter = contextAdapter;
+		public ButtonSelectionListener(EditingContextAdapter editingContextAdapter, Runnable runnable) {
+			this.editingContextAdapter = editingContextAdapter;
 			this.runnable = runnable;
 		}
 
@@ -365,7 +365,7 @@ public abstract class AbstractEEFExtReferenceLifecycleManager extends AbstractEE
 		 */
 		@Override
 		public void widgetSelected(SelectionEvent event) {
-			this.contextAdapter.performModelChange(this.runnable);
+			this.editingContextAdapter.performModelChange(this.runnable);
 		}
 
 		/**
@@ -375,7 +375,7 @@ public abstract class AbstractEEFExtReferenceLifecycleManager extends AbstractEE
 		 */
 		@Override
 		public void widgetDefaultSelected(SelectionEvent event) {
-			this.contextAdapter.performModelChange(this.runnable);
+			this.editingContextAdapter.performModelChange(this.runnable);
 		}
 	}
 
diff --git a/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/EEFExtMultipleReferenceLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/EEFExtMultipleReferenceLifecycleManager.java
index 54c4e5f89..e83893bc3 100644
--- a/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/EEFExtMultipleReferenceLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/EEFExtMultipleReferenceLifecycleManager.java
@@ -97,12 +97,12 @@ public class EEFExtMultipleReferenceLifecycleManager extends AbstractEEFExtRefer
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The context adapter
 	 */
 	public EEFExtMultipleReferenceLifecycleManager(EEFExtReferenceDescription description, EObject target, EReference eReference,
-			IVariableManager variableManager, IInterpreter interpreter, EditingContextAdapter contextAdapter) {
-		super(description, target, eReference, variableManager, interpreter, contextAdapter);
+			IVariableManager variableManager, IInterpreter interpreter, EditingContextAdapter editingContextAdapter) {
+		super(description, target, eReference, variableManager, interpreter, editingContextAdapter);
 	}
 
 	/**
@@ -155,7 +155,7 @@ public class EEFExtMultipleReferenceLifecycleManager extends AbstractEEFExtRefer
 
 		this.widgetFactory.paintBordersFor(parent);
 
-		this.controller = new EEFExtReferenceController(this.description, this.variableManager, this.interpreter);
+		this.controller = new EEFExtReferenceController(this.description, this.variableManager, this.interpreter, this.editingContextAdapter);
 	}
 
 	/**
@@ -244,7 +244,7 @@ public class EEFExtMultipleReferenceLifecycleManager extends AbstractEEFExtRefer
 	 */
 	@Override
 	protected void addButtonCallback() {
-		IWizard wizard = new EEFExtEObjectCreationWizard(this.target, this.eReference, this.contextAdapter);
+		IWizard wizard = new EEFExtEObjectCreationWizard(this.target, this.eReference, this.editingContextAdapter);
 		WizardDialog wizardDialog = new WizardDialog(this.tableViewer.getTable().getShell(), wizard);
 		wizardDialog.open();
 	}
@@ -256,7 +256,7 @@ public class EEFExtMultipleReferenceLifecycleManager extends AbstractEEFExtRefer
 	 */
 	@Override
 	protected void removeButtonCallback() {
-		this.contextAdapter.performModelChange(() -> {
+		this.editingContextAdapter.performModelChange(() -> {
 			List<Object> objects = selectionToList(tableViewer.getSelection());
 			for (Object object : objects) {
 				EcoreUtil.remove(target, eReference, object);
@@ -271,7 +271,7 @@ public class EEFExtMultipleReferenceLifecycleManager extends AbstractEEFExtRefer
 	 *            The direction
 	 */
 	private void initializeMoveButton(final Direction direction) {
-		ButtonSelectionListener listener = new ButtonSelectionListener(this.contextAdapter, () -> this.moveButtonCallback(direction));
+		ButtonSelectionListener listener = new ButtonSelectionListener(this.editingContextAdapter, () -> this.moveButtonCallback(direction));
 
 		if (direction == Direction.UP) {
 			this.upButtonListener = listener;
diff --git a/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/EEFExtSingleReferenceLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/EEFExtSingleReferenceLifecycleManager.java
index 76fa151df..2f9be36cb 100644
--- a/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/EEFExtSingleReferenceLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui.ext.widgets.reference/src/org/eclipse/eef/ide/ui/ext/widgets/reference/internal/EEFExtSingleReferenceLifecycleManager.java
@@ -63,12 +63,12 @@ public class EEFExtSingleReferenceLifecycleManager extends AbstractEEFExtReferen
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The context adapter
 	 */
 	public EEFExtSingleReferenceLifecycleManager(EEFExtReferenceDescription description, EObject target, EReference eReference,
-			IVariableManager variableManager, IInterpreter interpreter, EditingContextAdapter contextAdapter) {
-		super(description, target, eReference, variableManager, interpreter, contextAdapter);
+			IVariableManager variableManager, IInterpreter interpreter, EditingContextAdapter editingContextAdapter) {
+		super(description, target, eReference, variableManager, interpreter, editingContextAdapter);
 	}
 
 	/**
@@ -118,7 +118,7 @@ public class EEFExtSingleReferenceLifecycleManager extends AbstractEEFExtReferen
 
 		this.widgetFactory.paintBordersFor(parent);
 
-		this.controller = new EEFExtReferenceController(this.description, this.variableManager, this.interpreter);
+		this.controller = new EEFExtReferenceController(this.description, this.variableManager, this.interpreter, this.editingContextAdapter);
 	}
 
 	/**
@@ -155,7 +155,7 @@ public class EEFExtSingleReferenceLifecycleManager extends AbstractEEFExtReferen
 	 */
 	@Override
 	protected void browseButtonCallback() {
-		IWizard wizard = new EEFExtEObjectSelectionWizard(this.target, this.eReference, this.contextAdapter);
+		IWizard wizard = new EEFExtEObjectSelectionWizard(this.target, this.eReference, this.editingContextAdapter);
 		WizardDialog wizardDialog = new WizardDialog(this.text.getShell(), wizard);
 		wizardDialog.open();
 	}
@@ -167,7 +167,7 @@ public class EEFExtSingleReferenceLifecycleManager extends AbstractEEFExtReferen
 	 */
 	@Override
 	protected void addButtonCallback() {
-		IWizard wizard = new EEFExtEObjectCreationWizard(this.target, this.eReference, this.contextAdapter);
+		IWizard wizard = new EEFExtEObjectCreationWizard(this.target, this.eReference, this.editingContextAdapter);
 		WizardDialog wizardDialog = new WizardDialog(this.text.getShell(), wizard);
 		wizardDialog.open();
 	}
@@ -179,7 +179,7 @@ public class EEFExtSingleReferenceLifecycleManager extends AbstractEEFExtReferen
 	 */
 	@Override
 	protected void removeButtonCallback() {
-		this.contextAdapter.performModelChange(() -> target.eUnset(eReference));
+		this.editingContextAdapter.performModelChange(() -> target.eUnset(eReference));
 	}
 
 	/**
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/widgets/AbstractEEFWidgetLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/widgets/AbstractEEFWidgetLifecycleManager.java
index 2140fc918..79506bdc3 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/widgets/AbstractEEFWidgetLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/widgets/AbstractEEFWidgetLifecycleManager.java
@@ -79,7 +79,7 @@ public abstract class AbstractEEFWidgetLifecycleManager extends AbstractEEFLifec
 	/**
 	 * The editing context adapter.
 	 */
-	protected EditingContextAdapter contextAdapter;
+	protected EditingContextAdapter editingContextAdapter;
 
 	/**
 	 * The label.
@@ -113,13 +113,14 @@ public abstract class AbstractEEFWidgetLifecycleManager extends AbstractEEFLifec
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
-	public AbstractEEFWidgetLifecycleManager(IVariableManager variableManager, IInterpreter interpreter, EditingContextAdapter contextAdapter) {
+	public AbstractEEFWidgetLifecycleManager(IVariableManager variableManager, IInterpreter interpreter,
+			EditingContextAdapter editingContextAdapter) {
 		this.variableManager = variableManager;
 		this.interpreter = interpreter;
-		this.contextAdapter = contextAdapter;
+		this.editingContextAdapter = editingContextAdapter;
 	}
 
 	/**
@@ -198,7 +199,7 @@ public abstract class AbstractEEFWidgetLifecycleManager extends AbstractEEFLifec
 	private void checkLockStatus() {
 		Object self = this.variableManager.getVariables().get(EEFExpressionUtils.SELF);
 		if (self instanceof EObject) {
-			LockStatus status = this.contextAdapter.getLockStatus((EObject) self);
+			LockStatus status = this.editingContextAdapter.getLockStatus((EObject) self);
 			this.handleLockStatus(status);
 		}
 	}
@@ -320,7 +321,7 @@ public abstract class AbstractEEFWidgetLifecycleManager extends AbstractEEFLifec
 					.forEach(event -> this.handleLockStatus(event.getStatus()));
 			});
 		};
-		this.contextAdapter.addLockStatusChangedListener(this.lockStatusChangedListener);
+		this.editingContextAdapter.addLockStatusChangedListener(this.lockStatusChangedListener);
 	}
 
 	/**
@@ -478,7 +479,7 @@ public abstract class AbstractEEFWidgetLifecycleManager extends AbstractEEFLifec
 		}
 
 		this.getController().removeNewLabelConsumer();
-		this.contextAdapter.removeLockStatusChangedListener(this.lockStatusChangedListener);
+		this.editingContextAdapter.removeLockStatusChangedListener(this.lockStatusChangedListener);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/widgets/IEEFLifecycleManagerProvider.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/widgets/IEEFLifecycleManagerProvider.java
index b0672687d..26e907dc5 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/widgets/IEEFLifecycleManagerProvider.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/api/widgets/IEEFLifecycleManagerProvider.java
@@ -41,12 +41,12 @@ public interface IEEFLifecycleManagerProvider {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 *
 	 * @return An {@link IEEFLifecycleManager}
 	 */
 	IEEFLifecycleManager getLifecycleManager(EEFControlDescription controlDescription, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter);
+			EditingContextAdapter editingContextAdapter);
 
 }
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFButtonLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFButtonLifecycleManager.java
index c65965603..1e9228d57 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFButtonLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFButtonLifecycleManager.java
@@ -75,12 +75,12 @@ public class EEFButtonLifecycleManager extends AbstractEEFWidgetLifecycleManager
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFButtonLifecycleManager(EEFButtonDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
 	}
 
@@ -104,7 +104,7 @@ public class EEFButtonLifecycleManager extends AbstractEEFWidgetLifecycleManager
 		widgetFactory.paintBordersFor(parent);
 
 		this.controller = new EEFControllersFactory().createButtonController(this.description, this.variableManager, this.interpreter,
-				this.contextAdapter);
+				this.editingContextAdapter);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFCheckboxLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFCheckboxLifecycleManager.java
index e4c627292..c86120b40 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFCheckboxLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFCheckboxLifecycleManager.java
@@ -77,12 +77,12 @@ public class EEFCheckboxLifecycleManager extends AbstractEEFWidgetLifecycleManag
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFCheckboxLifecycleManager(EEFCheckboxDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
 	}
 
@@ -102,7 +102,7 @@ public class EEFCheckboxLifecycleManager extends AbstractEEFWidgetLifecycleManag
 		this.checkbox.setLayoutData(gridData);
 
 		this.controller = new EEFControllersFactory().createCheckboxController(this.description, this.variableManager, this.interpreter,
-				this.contextAdapter);
+				this.editingContextAdapter);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFContainerLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFContainerLifecycleManager.java
index 0dfb9fd7e..c962c0746 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFContainerLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFContainerLifecycleManager.java
@@ -71,15 +71,15 @@ public class EEFContainerLifecycleManager implements IEEFLifecycleManager {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFContainerLifecycleManager(EEFContainerDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
+			EditingContextAdapter editingContextAdapter) {
 		this.description = description;
 		this.variableManager = variableManager;
 		this.interpreter = interpreter;
-		this.contextAdapter = contextAdapter;
+		this.contextAdapter = editingContextAdapter;
 	}
 
 	/**
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFControlSwitch.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFControlSwitch.java
index 49e9bb6e2..0119e06f4 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFControlSwitch.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFControlSwitch.java
@@ -59,19 +59,19 @@ public class EEFControlSwitch {
 	/**
 	 * The editing context adapter.
 	 */
-	private EditingContextAdapter contextAdapter;
+	private EditingContextAdapter editingContextAdapter;
 
 	/**
 	 * The constructor.
 	 *
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
-	public EEFControlSwitch(IInterpreter interpreter, EditingContextAdapter contextAdapter) {
+	public EEFControlSwitch(IInterpreter interpreter, EditingContextAdapter editingContextAdapter) {
 		this.interpreter = interpreter;
-		this.contextAdapter = contextAdapter;
+		this.editingContextAdapter = editingContextAdapter;
 	}
 
 	/**
@@ -98,20 +98,20 @@ public class EEFControlSwitch {
 			IEEFLifecycleManagerProvider eefLifecycleManagerProvider = EEFIdeUiPlugin.getPlugin().getEEFLifecycleManagerProvider(controlDescription);
 			if (eefLifecycleManagerProvider != null) {
 				eefContainerLifecycleManager = eefLifecycleManagerProvider.getLifecycleManager(controlDescription, childVariableManager, interpreter,
-						contextAdapter);
+						this.editingContextAdapter);
 			} else {
 				eefContainerLifecycleManager = new EEFContainerLifecycleManager((EEFContainerDescription) controlDescription, childVariableManager,
-						this.interpreter, this.contextAdapter);
+						this.interpreter, this.editingContextAdapter);
 			}
 
 			eefContainerLifecycleManager.createControl(parent, formContainer);
 			lifecycleManagers.add(eefContainerLifecycleManager);
 		} else if (controlDescription instanceof EEFWidgetDescription) {
-			lifecycleManagers.addAll(this.createWidgetControl(parent, formContainer, (EEFWidgetDescription) controlDescription,
-					variableManager.createChild()));
+			lifecycleManagers.addAll(
+					this.createWidgetControl(parent, formContainer, (EEFWidgetDescription) controlDescription, variableManager.createChild()));
 		} else if (controlDescription instanceof EEFDynamicMappingFor) {
-			lifecycleManagers.addAll(this.createDynamicMappingControl(parent, formContainer, (EEFDynamicMappingFor) controlDescription,
-					variableManager));
+			lifecycleManagers
+					.addAll(this.createDynamicMappingControl(parent, formContainer, (EEFDynamicMappingFor) controlDescription, variableManager));
 		}
 		return lifecycleManagers;
 	}
@@ -138,7 +138,7 @@ public class EEFControlSwitch {
 		if (eefLifecycleManagerProvider != null) {
 			// We have a lifecycle manager provider, let's use it
 			IEEFLifecycleManager eefLifecycleManager = eefLifecycleManagerProvider.getLifecycleManager(widgetDescription, childVariableManager,
-					interpreter, contextAdapter);
+					interpreter, this.editingContextAdapter);
 			if (eefLifecycleManager != null) {
 				eefLifecycleManager.createControl(parent, formContainer);
 				lifecycleManagers.add(eefLifecycleManager);
@@ -153,7 +153,7 @@ public class EEFControlSwitch {
 				EEFTextDescription eefTextDescription = (EEFTextDescription) widgetDescription;
 
 				EEFTextLifecycleManager eefTextLifecycleManager = new EEFTextLifecycleManager(eefTextDescription, childVariableManager, interpreter,
-						contextAdapter);
+						this.editingContextAdapter);
 				eefTextLifecycleManager.createControl(parent, formContainer);
 
 				lifecycleManagers.add(eefTextLifecycleManager);
@@ -161,7 +161,7 @@ public class EEFControlSwitch {
 				EEFLabelDescription eefLabelDescription = (EEFLabelDescription) widgetDescription;
 
 				EEFLabelLifecycleManager eefLabelLifecycleManager = new EEFLabelLifecycleManager(eefLabelDescription, childVariableManager,
-						interpreter, contextAdapter);
+						interpreter, this.editingContextAdapter);
 				eefLabelLifecycleManager.createControl(parent, formContainer);
 
 				lifecycleManagers.add(eefLabelLifecycleManager);
@@ -169,7 +169,7 @@ public class EEFControlSwitch {
 				EEFSelectDescription eefSelectDescription = (EEFSelectDescription) widgetDescription;
 
 				EEFSelectLifecycleManager eefSelectLifecycleManager = new EEFSelectLifecycleManager(eefSelectDescription, childVariableManager,
-						interpreter, contextAdapter);
+						interpreter, this.editingContextAdapter);
 				eefSelectLifecycleManager.createControl(parent, formContainer);
 
 				lifecycleManagers.add(eefSelectLifecycleManager);
@@ -177,7 +177,7 @@ public class EEFControlSwitch {
 				EEFRadioDescription eefRadioDescription = (EEFRadioDescription) widgetDescription;
 
 				EEFRadioLifecycleManager eefRadioLifecycleManager = new EEFRadioLifecycleManager(eefRadioDescription, childVariableManager,
-						interpreter, contextAdapter);
+						interpreter, this.editingContextAdapter);
 				eefRadioLifecycleManager.createControl(parent, formContainer);
 
 				lifecycleManagers.add(eefRadioLifecycleManager);
@@ -185,7 +185,7 @@ public class EEFControlSwitch {
 				EEFCheckboxDescription eefCheckboxDescription = (EEFCheckboxDescription) widgetDescription;
 
 				EEFCheckboxLifecycleManager eefCheckboxLifecycleManager = new EEFCheckboxLifecycleManager(eefCheckboxDescription,
-						childVariableManager, interpreter, contextAdapter);
+						childVariableManager, interpreter, this.editingContextAdapter);
 				eefCheckboxLifecycleManager.createControl(parent, formContainer);
 
 				lifecycleManagers.add(eefCheckboxLifecycleManager);
@@ -193,7 +193,7 @@ public class EEFControlSwitch {
 				EEFButtonDescription eefButtonDescription = (EEFButtonDescription) widgetDescription;
 
 				EEFButtonLifecycleManager eefButtonLifecycleManager = new EEFButtonLifecycleManager(eefButtonDescription, childVariableManager,
-						interpreter, contextAdapter);
+						interpreter, this.editingContextAdapter);
 				eefButtonLifecycleManager.createControl(parent, formContainer);
 
 				lifecycleManagers.add(eefButtonLifecycleManager);
@@ -201,7 +201,7 @@ public class EEFControlSwitch {
 				EEFListDescription eefListDescription = (EEFListDescription) widgetDescription;
 
 				IEEFLifecycleManager eefListLifecycleManager = new EEFListLifecycleManager(eefListDescription, childVariableManager, interpreter,
-						contextAdapter);
+						this.editingContextAdapter);
 				eefListLifecycleManager.createControl(parent, formContainer);
 
 				lifecycleManagers.add(eefListLifecycleManager);
@@ -209,7 +209,7 @@ public class EEFControlSwitch {
 				EEFHyperlinkDescription eefHyperlinkDescription = (EEFHyperlinkDescription) widgetDescription;
 
 				EEFHyperlinkLifecycleManager eefHyperlinkLifecycleManager = new EEFHyperlinkLifecycleManager(eefHyperlinkDescription,
-						childVariableManager, interpreter, contextAdapter);
+						childVariableManager, interpreter, this.editingContextAdapter);
 				eefHyperlinkLifecycleManager.createControl(parent, formContainer);
 
 				lifecycleManagers.add(eefHyperlinkLifecycleManager);
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFGroupLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFGroupLifecycleManager.java
index 02e9520a7..a99e8572e 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFGroupLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFGroupLifecycleManager.java
@@ -63,7 +63,7 @@ public class EEFGroupLifecycleManager extends AbstractEEFLifecycleManager {
 	/**
 	 * The editing context adapter.
 	 */
-	private EditingContextAdapter contextAdapter;
+	private EditingContextAdapter editingContextAdapter;
 
 	/**
 	 * The description of the container.
@@ -94,15 +94,15 @@ public class EEFGroupLifecycleManager extends AbstractEEFLifecycleManager {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFGroupLifecycleManager(EEFGroupDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
+			EditingContextAdapter editingContextAdapter) {
 		this.description = description;
 		this.variableManager = variableManager;
 		this.interpreter = interpreter;
-		this.contextAdapter = contextAdapter;
+		this.editingContextAdapter = editingContextAdapter;
 	}
 
 	/**
@@ -204,9 +204,10 @@ public class EEFGroupLifecycleManager extends AbstractEEFLifecycleManager {
 
 		this.section.setClient(group);
 
-		this.controller = new EEFControllersFactory().createGroupController(this.description, this.variableManager, this.interpreter);
+		this.controller = new EEFControllersFactory().createGroupController(this.description, this.variableManager, this.interpreter,
+				this.editingContextAdapter);
 
-		EEFControlSwitch eefControlSwitch = new EEFControlSwitch(this.interpreter, this.contextAdapter);
+		EEFControlSwitch eefControlSwitch = new EEFControlSwitch(this.interpreter, this.editingContextAdapter);
 		List<EEFControlDescription> controls = this.description.getControls();
 		for (EEFControlDescription eefControlDescription : controls) {
 			this.lifecycleManagers.addAll(eefControlSwitch.doCreate(group, formContainer, eefControlDescription, this.variableManager));
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFHyperlinkLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFHyperlinkLifecycleManager.java
index 8e286817c..62a18e744 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFHyperlinkLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFHyperlinkLifecycleManager.java
@@ -88,12 +88,12 @@ public class EEFHyperlinkLifecycleManager extends AbstractEEFWidgetLifecycleMana
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFHyperlinkLifecycleManager(EEFHyperlinkDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
 	}
 
@@ -122,7 +122,7 @@ public class EEFHyperlinkLifecycleManager extends AbstractEEFWidgetLifecycleMana
 		this.createWidgetActionButtons(hyperlinkComposite);
 
 		this.controller = new EEFControllersFactory().createHyperlinkController(this.description, this.variableManager, this.interpreter,
-				this.contextAdapter);
+				this.editingContextAdapter);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFHyperlinkListener.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFHyperlinkListener.java
index eeb28150a..03fa84b19 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFHyperlinkListener.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFHyperlinkListener.java
@@ -97,7 +97,7 @@ public class EEFHyperlinkListener implements MouseListener {
 					}
 				}
 			}
-		} catch (IllegalArgumentException exception) {
+		} catch (@SuppressWarnings("unused") IllegalArgumentException exception) {
 			// do not log, the user tried to click outside of the hyperlink
 		}
 	}
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFLabelLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFLabelLifecycleManager.java
index fefca699c..3d44c8781 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFLabelLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFLabelLifecycleManager.java
@@ -90,12 +90,12 @@ public class EEFLabelLifecycleManager extends AbstractEEFWidgetLifecycleManager
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFLabelLifecycleManager(EEFLabelDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
 	}
 
@@ -124,7 +124,7 @@ public class EEFLabelLifecycleManager extends AbstractEEFWidgetLifecycleManager
 		this.createWidgetActionButtons(labelComposite);
 
 		this.controller = new EEFControllersFactory().createLabelController(this.description, this.variableManager, this.interpreter,
-				this.contextAdapter);
+				this.editingContextAdapter);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFListLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFListLifecycleManager.java
index 1fcb82bac..e2555e7c7 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFListLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFListLifecycleManager.java
@@ -104,12 +104,12 @@ public class EEFListLifecycleManager extends AbstractEEFWidgetLifecycleManager {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFListLifecycleManager(EEFListDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
 	}
 
@@ -138,7 +138,7 @@ public class EEFListLifecycleManager extends AbstractEEFWidgetLifecycleManager {
 		widgetFactory.paintBordersFor(parent);
 
 		this.controller = new EEFControllersFactory().createListController(this.description, this.variableManager, this.interpreter,
-				this.contextAdapter);
+				this.editingContextAdapter);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFRadioLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFRadioLifecycleManager.java
index 32682d277..90e009c36 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFRadioLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFRadioLifecycleManager.java
@@ -96,12 +96,12 @@ public class EEFRadioLifecycleManager extends AbstractEEFWidgetLifecycleManager
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFRadioLifecycleManager(EEFRadioDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
 	}
 
@@ -127,7 +127,7 @@ public class EEFRadioLifecycleManager extends AbstractEEFWidgetLifecycleManager
 		widgetFactory.paintBordersFor(parent);
 
 		this.controller = new EEFControllersFactory().createRadioController(this.description, this.variableManager, this.interpreter,
-				this.contextAdapter);
+				this.editingContextAdapter);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSectionLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSectionLifecycleManager.java
index db5087c43..ed91e3f99 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSectionLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSectionLifecycleManager.java
@@ -77,7 +77,7 @@ public class EEFSectionLifecycleManager extends AbstractEEFLifecycleManager {
 		this.hyperlinkListener = new EEFMessageHyperlinkListener(formContainer.getShell());
 
 		this.controller = new EEFControllersFactory().createSectionController(this.eefPage.getDescription(), this.eefPage.getVariableManager(),
-				this.eefPage.getInterpreter());
+				this.eefPage.getInterpreter(), this.eefPage.getView().getContextAdapter());
 
 		List<EEFGroup> eefGroups = this.eefPage.getGroups();
 		for (EEFGroup eefGroup : eefGroups) {
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSelectLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSelectLifecycleManager.java
index 5dd740ca3..0635a47bf 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSelectLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSelectLifecycleManager.java
@@ -102,12 +102,12 @@ public class EEFSelectLifecycleManager extends AbstractEEFWidgetLifecycleManager
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFSelectLifecycleManager(EEFSelectDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
 	}
 
@@ -133,7 +133,7 @@ public class EEFSelectLifecycleManager extends AbstractEEFWidgetLifecycleManager
 		widgetFactory.paintBordersFor(parent);
 
 		this.controller = new EEFControllersFactory().createSelectController(this.description, this.variableManager, this.interpreter,
-				this.contextAdapter);
+				this.editingContextAdapter);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFTextLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFTextLifecycleManager.java
index 4dbb77ab1..e88b1ad63 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFTextLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFTextLifecycleManager.java
@@ -123,12 +123,12 @@ public class EEFTextLifecycleManager extends AbstractEEFWidgetLifecycleManager {
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public EEFTextLifecycleManager(EEFTextDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
 	}
 
@@ -165,7 +165,7 @@ public class EEFTextLifecycleManager extends AbstractEEFWidgetLifecycleManager {
 		widgetFactory.paintBordersFor(parent);
 
 		this.controller = new EEFControllersFactory().createTextController(this.description, this.variableManager, this.interpreter,
-				this.contextAdapter);
+				this.editingContextAdapter);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/quickfix/EEFQuickFixPage.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/quickfix/EEFQuickFixPage.java
index 21b6347c9..019a65a68 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/quickfix/EEFQuickFixPage.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/quickfix/EEFQuickFixPage.java
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.eef.EEFValidationFixDescription;
 import org.eclipse.eef.EEFValidationRuleDescription;
 import org.eclipse.eef.EefPackage;
-import org.eclipse.eef.core.api.utils.EvalFactory.Eval;
+import org.eclipse.eef.core.api.controllers.InvalidValidationRuleResultData;
 import org.eclipse.eef.ide.ui.internal.EEFIdeUiPlugin;
 import org.eclipse.eef.ide.ui.internal.Messages;
 import org.eclipse.emf.ecore.EAttribute;
@@ -57,9 +57,9 @@ public class EEFQuickFixPage extends WizardPage {
 	private EEFValidationRuleDescription validationRule;
 
 	/**
-	 * The evaluation utility class.
+	 * The invalid validation result data.
 	 */
-	private Eval<?> eval;
+	private InvalidValidationRuleResultData data;
 
 	/**
 	 * The selected {@link IMessage}.
@@ -73,15 +73,15 @@ public class EEFQuickFixPage extends WizardPage {
 	 *            The message
 	 * @param validationRule
 	 *            The validation rule
-	 * @param eval
-	 *            The evaluation utility class
+	 * @param data
+	 *            The invalid validation result data
 	 */
-	public EEFQuickFixPage(IMessage message, EEFValidationRuleDescription validationRule, Eval<?> eval) {
+	public EEFQuickFixPage(IMessage message, EEFValidationRuleDescription validationRule, InvalidValidationRuleResultData data) {
 		super(message.getMessage());
 		this.setTitle(Messages.EEFQuickFixPage_title);
 		this.setDescription(MessageFormat.format(Messages.EEFQuickFixPage_description, message.getMessage()));
 		this.validationRule = validationRule;
-		this.eval = eval;
+		this.data = data;
 		this.selectedMessage = message;
 	}
 
@@ -183,7 +183,9 @@ public class EEFQuickFixPage extends WizardPage {
 						// Run the quick fix using the given eval
 						EEFValidationFixDescription validationFix = (EEFValidationFixDescription) element;
 						EAttribute expressionEAttribute = EefPackage.Literals.EEF_VALIDATION_FIX_DESCRIPTION__FIX_EXPRESSION;
-						this.eval.logIfBlank(expressionEAttribute).call(validationFix.getFixExpression());
+						this.data.getEditingContextAdapter().performModelChange(() -> {
+							this.data.getEval().logIfBlank(expressionEAttribute).call(validationFix.getFixExpression());
+						});
 					}
 				}
 
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/quickfix/EEFQuickFixWizard.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/quickfix/EEFQuickFixWizard.java
index a2d3a60f6..48a53a6ef 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/quickfix/EEFQuickFixWizard.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/quickfix/EEFQuickFixWizard.java
@@ -15,7 +15,7 @@ import java.lang.reflect.InvocationTargetException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.eef.EEFValidationRuleDescription;
-import org.eclipse.eef.core.api.utils.EvalFactory.Eval;
+import org.eclipse.eef.core.api.controllers.InvalidValidationRuleResultData;
 import org.eclipse.eef.ide.ui.internal.EEFIdeUiPlugin;
 import org.eclipse.eef.ide.ui.internal.Icons;
 import org.eclipse.eef.ide.ui.internal.Messages;
@@ -76,11 +76,11 @@ public class EEFQuickFixWizard extends Wizard {
 		if (this.messages.length == 1) {
 			// We have only one validation rule violated, let's show only the fix available
 			IMessage message = this.messages[0];
-			if (message.getKey() instanceof EEFValidationRuleDescription && message.getData() instanceof Eval) {
+			if (message.getKey() instanceof EEFValidationRuleDescription && message.getData() instanceof InvalidValidationRuleResultData) {
 				EEFValidationRuleDescription validationRule = (EEFValidationRuleDescription) message.getKey();
-				Eval<?> eval = (Eval<?>) message.getData();
+				InvalidValidationRuleResultData data = (InvalidValidationRuleResultData) message.getData();
 
-				this.quickFixPage = new EEFQuickFixPage(message, validationRule, eval);
+				this.quickFixPage = new EEFQuickFixPage(message, validationRule, data);
 				this.addPage(this.quickFixPage);
 			}
 		} else {
@@ -103,12 +103,12 @@ public class EEFQuickFixWizard extends Wizard {
 			IMessage message = validationRulesPage.getSelectedMessage();
 
 			// The second page will show the quick fixes of the message of the first page
-			if (message.getKey() instanceof EEFValidationRuleDescription && message.getData() instanceof Eval) {
+			if (message.getKey() instanceof EEFValidationRuleDescription && message.getData() instanceof InvalidValidationRuleResultData) {
 				EEFValidationRuleDescription validationRule = (EEFValidationRuleDescription) message.getKey();
 
 				if (validationRule.getFixes().size() > 0) {
-					Eval<?> eval = (Eval<?>) message.getData();
-					this.quickFixPage = new EEFQuickFixPage(message, validationRule, eval);
+					InvalidValidationRuleResultData data = (InvalidValidationRuleResultData) message.getData();
+					this.quickFixPage = new EEFQuickFixPage(message, validationRule, data);
 					this.quickFixPage.setWizard(this);
 					return this.quickFixPage;
 				}
diff --git a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerController.java b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerController.java
index 60d197478..7c16e7f39 100644
--- a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerController.java
+++ b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerController.java
@@ -65,12 +65,12 @@ public class ColorPickerController extends AbstractEEFCustomWidgetController imp
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 */
 	public ColorPickerController(EEFCustomWidgetDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(description, variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		super(description, variableManager, interpreter, editingContextAdapter);
 	}
 
 	/**
@@ -121,7 +121,7 @@ public class ColorPickerController extends AbstractEEFCustomWidgetController imp
 
 	@Override
 	public void updateValue(final RGB color) {
-		contextAdapter.performModelChange(() -> {
+		this.editingContextAdapter.performModelChange(() -> {
 			String editExpression = getCustomExpression(EDIT_EXPRESSION_ID);
 
 			Map<String, Object> variables = new HashMap<String, Object>();
diff --git a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerLifecycleManager.java b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerLifecycleManager.java
index b70e08bf1..b5357a9dc 100644
--- a/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerLifecycleManager.java
+++ b/samples/org.eclipse.eef.sample.custom.widget.colorpicker/src/org/eclipse/eef/sample/custom/widget/colorpicker/ColorPickerLifecycleManager.java
@@ -64,13 +64,13 @@ public class ColorPickerLifecycleManager extends AbstractEEFWidgetLifecycleManag
 	 *            The variable manager
 	 * @param interpreter
 	 *            The interpreter
-	 * @param contextAdapter
+	 * @param editingContextAdapter
 	 *            The editing context adapter
 	 * @param singleReferenceViewerProvider
 	 */
 	public ColorPickerLifecycleManager(EEFCustomWidgetDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter, contextAdapter);
+			EditingContextAdapter editingContextAdapter) {
+		super(variableManager, interpreter, editingContextAdapter);
 		this.description = description;
 	}
 
@@ -82,7 +82,7 @@ public class ColorPickerLifecycleManager extends AbstractEEFWidgetLifecycleManag
 		this.colorPicker = new ColorPicker(parent);
 		widgetFactory.paintBordersFor(parent);
 
-		this.controller = new ColorPickerController(this.description, this.variableManager, this.interpreter, this.contextAdapter);
+		this.controller = new ColorPickerController(this.description, this.variableManager, this.interpreter, this.editingContextAdapter);
 	}
 
 	/**