[500681] Remove the old reference widget

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

36 files changed, 35 insertions, 3818 deletions

diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/EEFControllersFactory.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/EEFControllersFactory.java
index 6982ab010..1edaa6ae3 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
@@ -18,7 +18,6 @@ import org.eclipse.eef.EEFLabelDescription;
 import org.eclipse.eef.EEFListDescription;
 import org.eclipse.eef.EEFPageDescription;
 import org.eclipse.eef.EEFRadioDescription;
-import org.eclipse.eef.EEFReferenceDescription;
 import org.eclipse.eef.EEFSelectDescription;
 import org.eclipse.eef.EEFTextDescription;
 import org.eclipse.eef.core.api.EditingContextAdapter;
@@ -29,7 +28,6 @@ import org.eclipse.eef.core.internal.controllers.EEFHyperlinkController;
 import org.eclipse.eef.core.internal.controllers.EEFLabelController;
 import org.eclipse.eef.core.internal.controllers.EEFListController;
 import org.eclipse.eef.core.internal.controllers.EEFRadioController;
-import org.eclipse.eef.core.internal.controllers.EEFReferenceController;
 import org.eclipse.eef.core.internal.controllers.EEFSectionController;
 import org.eclipse.eef.core.internal.controllers.EEFSelectController;
 import org.eclipse.eef.core.internal.controllers.EEFTextController;
@@ -183,24 +181,6 @@ public class EEFControllersFactory {
 	}
 
 	/**
-	 * Creates a reference controller.
-	 *
-	 * @param description
-	 *            The description
-	 * @param variableManager
-	 *            The variable manager
-	 * @param interpreter
-	 *            The interpreter
-	 * @param contextAdapter
-	 *            The editing context adapter
-	 * @return The reference controller.
-	 */
-	public IEEFReferenceController createReferenceController(EEFReferenceDescription description, IVariableManager variableManager,
-			IInterpreter interpreter, EditingContextAdapter contextAdapter) {
-		return new EEFReferenceController(variableManager, interpreter, description, contextAdapter);
-	}
-
-	/**
 	 * Creates a list controller.
 	 *
 	 * @param description
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFReferenceController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFReferenceController.java
deleted file mode 100644
index 30ddd5803..000000000
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/api/controllers/IEEFReferenceController.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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 java.util.List;
-
-import org.eclipse.eef.EEFWidgetAction;
-
-/**
- * The IEEFReferenceController is responsible of supporting all the interactions with the widgets created for a
- * reference viewer.
- *
- * @author mbats
- */
-public interface IEEFReferenceController extends IEEFWidgetController {
-	/**
-	 * Register a consumer which will be called with the new value of the text when it will change.
-	 *
-	 * @param consumer
-	 *            The consumer of the new value of the text
-	 */
-	void onNewValue(IConsumer<Object> consumer);
-
-	/**
-	 * Remove the consumer of the new value of the text.
-	 */
-	void removeNewValueConsumer();
-
-	/**
-	 * Invoked when the user clicks on an hyperlink.
-	 *
-	 * @param element
-	 *            Semantic element
-	 * @param onClickEventKind
-	 *            The kind of event (single click or double click)
-	 */
-	void onClick(Object element, String onClickEventKind);
-
-	/**
-	 * Invoked when the user clicks on an action button.
-	 *
-	 * @param action
-	 *            Widget action
-	 * @param selection
-	 *            The selected elements
-	 */
-	void action(EEFWidgetAction action, List<Object> selection);
-
-}
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFReferenceController.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFReferenceController.java
deleted file mode 100644
index 5b4caa9bd..000000000
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/controllers/EEFReferenceController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2016 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.internal.controllers;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.eef.EEFReferenceDescription;
-import org.eclipse.eef.EEFWidgetAction;
-import org.eclipse.eef.EEFWidgetDescription;
-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.controllers.AbstractEEFWidgetController;
-import org.eclipse.eef.core.api.controllers.IConsumer;
-import org.eclipse.eef.core.api.controllers.IEEFReferenceController;
-import org.eclipse.eef.core.api.utils.EvalFactory;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.sirius.common.interpreter.api.IInterpreter;
-import org.eclipse.sirius.common.interpreter.api.IVariableManager;
-
-/**
- * This class will be used in order to manage the behavior of the reference widget.
- *
- * @author mbats
- */
-public class EEFReferenceController extends AbstractEEFWidgetController implements IEEFReferenceController {
-	/**
-	 * The description.
-	 */
-	private EEFReferenceDescription description;
-
-	/**
-	 * The editing context adapter.
-	 */
-	private EditingContextAdapter contextAdapter;
-
-	/**
-	 * The consumer of a new value of the reference.
-	 */
-	private IConsumer<Object> newValueConsumer;
-
-	/**
-	 * The constructor.
-	 *
-	 * @param description
-	 *            The description
-	 * @param variableManager
-	 *            The variable manager
-	 * @param interpreter
-	 *            The interpreter
-	 * @param contextAdapter
-	 *            The editing context adapter
-	 */
-	public EEFReferenceController(IVariableManager variableManager, IInterpreter interpreter, EEFReferenceDescription description,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter);
-		this.description = description;
-		this.contextAdapter = contextAdapter;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.core.internal.controllers.AbstractEEFCustomWidgetController#refresh()
-	 */
-	@Override
-	public void refresh() {
-		super.refresh();
-
-		String valueExpression = this.description.getValueExpression();
-		this.newEval().call(valueExpression, this.newValueConsumer);
-	}
-
-	@Override
-	public void onNewValue(IConsumer<Object> consumer) {
-		this.newValueConsumer = consumer;
-	}
-
-	@Override
-	public void removeNewValueConsumer() {
-		this.newValueConsumer = null;
-	}
-
-	@Override
-	public void onClick(final Object element, final String onClickEventKind) {
-		contextAdapter.performModelChange(new Runnable() {
-			@Override
-			public void run() {
-				String expression = EEFReferenceController.this.description.getOnClickExpression();
-
-				Map<String, Object> variables = new HashMap<String, Object>();
-				variables.putAll(EEFReferenceController.this.variableManager.getVariables());
-				variables.put(EEFExpressionUtils.EEFReference.SELECTION, element);
-				variables.put(EEFExpressionUtils.EEFReference.ON_CLICK_EVENT_KIND, onClickEventKind);
-
-				EvalFactory.of(EEFReferenceController.this.interpreter, variables).call(expression);
-			}
-		});
-	}
-
-	@Override
-	protected EEFWidgetDescription getDescription() {
-		return this.description;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @param action
-	 *
-	 * @see org.eclipse.eef.core.api.controllers.IEEFReferenceController#action()
-	 */
-	@Override
-	public void action(final EEFWidgetAction action, final List<Object> elements) {
-		contextAdapter.performModelChange(new Runnable() {
-			@Override
-			public void run() {
-				String expression = action.getActionExpression();
-				EAttribute eAttribute = EefPackage.Literals.EEF_WIDGET_ACTION__ACTION_EXPRESSION;
-
-				Map<String, Object> variables = new HashMap<String, Object>();
-				variables.putAll(EEFReferenceController.this.variableManager.getVariables());
-				variables.put(EEFExpressionUtils.EEFReference.SELECTION, elements);
-
-				EvalFactory.of(EEFReferenceController.this.interpreter, variables).logIfBlank(eAttribute).call(expression);
-			}
-		});
-	}
-}
diff --git a/plugins/org.eclipse.eef.edit/plugin.properties b/plugins/org.eclipse.eef.edit/plugin.properties
index d052091c6..aa3eb5cac 100644
--- a/plugins/org.eclipse.eef.edit/plugin.properties
+++ b/plugins/org.eclipse.eef.edit/plugin.properties
@@ -42,7 +42,6 @@ _UI_EEFDynamicMappingFor_type = EEF Dynamic Mapping For
 _UI_EEFDynamicMappingIf_type = EEF Dynamic Mapping If
 _UI_EEFCustomWidgetDescription_type = EEF Custom Widget Description
 _UI_EEFCustomExpression_type = EEF Custom Expression
-_UI_EEFReferenceDescription_type = EEF Reference Description
 _UI_EEFWidgetStyle_type = EEF Widget Style
 _UI_EEFTextStyle_type = EEF Text Style
 _UI_EEFLabelStyle_type = EEF Label Style
@@ -52,7 +51,6 @@ _UI_EEFSelectStyle_type = EEF Select Style
 _UI_EEFRadioStyle_type = EEF Radio Style
 _UI_EEFHyperlinkStyle_type = EEF Hyperlink Style
 _UI_EEFCustomWidgetStyle_type = EEF Custom Widget Style
-_UI_EEFReferenceStyle_type = EEF Reference Style
 _UI_EEFConditionalStyle_type = EEF Conditional Style
 _UI_EEFTextConditionalStyle_type = EEF Text Conditional Style
 _UI_EEFButtonConditionalStyle_type = EEF Button Conditional Style
@@ -63,7 +61,6 @@ _UI_EEFRadioConditionalStyle_type = EEF Radio Conditional Style
 _UI_EEFHyperlinkConditionalStyle_type = EEF Hyperlink Conditional Style
 _UI_EEFCustomWidgetConditionalStyle_type = EEF Custom Widget Conditional Style
 _UI_EEFWidgetAction_type = EEF Widget Action
-_UI_EEFReferenceConditionalStyle_type = EEF Reference Conditional Style
 _UI_Unknown_type = Object
 
 _UI_Unknown_datatype= Value
@@ -156,13 +153,6 @@ _UI_EEFCustomWidgetDescription_style_feature = Style
 _UI_EEFCustomWidgetDescription_conditionalStyles_feature = Conditional Styles
 _UI_EEFCustomExpression_identifier_feature = Identifier
 _UI_EEFCustomExpression_customExpression_feature = Custom Expression
-_UI_EEFReferenceDescription_multiple_feature = Multiple
-_UI_EEFReferenceDescription_valueExpression_feature = Value Expression
-_UI_EEFReferenceDescription_displayExpression_feature = Display Expression
-_UI_EEFReferenceDescription_onClickExpression_feature = On Click Expression
-_UI_EEFReferenceDescription_actions_feature = Actions
-_UI_EEFReferenceDescription_style_feature = Style
-_UI_EEFReferenceDescription_conditionalStyles_feature = Conditional Styles
 _UI_EEFWidgetStyle_labelBackgroundColorExpression_feature = Label Background Color Expression
 _UI_EEFWidgetStyle_labelForegroundColorExpression_feature = Label Foreground Color Expression
 _UI_EEFWidgetStyle_labelFontNameExpression_feature = Label Font Name Expression
@@ -193,7 +183,6 @@ _UI_EEFHyperlinkConditionalStyle_style_feature = Style
 _UI_EEFCustomWidgetConditionalStyle_style_feature = Style
 _UI_EEFWidgetAction_labelExpression_feature = Label Expression
 _UI_EEFWidgetAction_actionExpression_feature = Action Expression
-_UI_EEFReferenceConditionalStyle_style_feature = Style
 _UI_Unknown_feature = Unspecified
 
 _UI_EEF_VALIDATION_SEVERITY_DESCRIPTION_INFO_literal = INFO
diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFContainerDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFContainerDescriptionItemProvider.java
index a06c615c5..1f59196f8 100644
--- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFContainerDescriptionItemProvider.java
+++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFContainerDescriptionItemProvider.java
@@ -174,9 +174,6 @@ public class EEFContainerDescriptionItemProvider extends EEFControlDescriptionIt
 				EefFactory.eINSTANCE.createEEFCustomWidgetDescription()));
 
 		newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__CONTROLS,
-				EefFactory.eINSTANCE.createEEFReferenceDescription()));
-
-		newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__CONTROLS,
 				EefFactory.eINSTANCE.createEEFListDescription()));
 
 		newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_CONTAINER_DESCRIPTION__LAYOUT,
diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFDynamicMappingIfItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFDynamicMappingIfItemProvider.java
index eea5519fa..3652f89eb 100644
--- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFDynamicMappingIfItemProvider.java
+++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFDynamicMappingIfItemProvider.java
@@ -199,9 +199,6 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 				EefFactory.eINSTANCE.createEEFCustomWidgetDescription()));
 
 		newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_DYNAMIC_MAPPING_IF__WIDGET,
-				EefFactory.eINSTANCE.createEEFReferenceDescription()));
-
-		newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_DYNAMIC_MAPPING_IF__WIDGET,
 				EefFactory.eINSTANCE.createEEFListDescription()));
 	}
 
diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupDescriptionItemProvider.java
index b8a71513b..6984dde5e 100644
--- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupDescriptionItemProvider.java
+++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFGroupDescriptionItemProvider.java
@@ -277,9 +277,6 @@ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 				EefFactory.eINSTANCE.createEEFCustomWidgetDescription()));
 
 		newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_GROUP_DESCRIPTION__CONTROLS,
-				EefFactory.eINSTANCE.createEEFReferenceDescription()));
-
-		newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_GROUP_DESCRIPTION__CONTROLS,
 				EefFactory.eINSTANCE.createEEFListDescription()));
 
 		newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_GROUP_DESCRIPTION__SEMANTIC_VALIDATION_RULES,
diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListConditionalStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListConditionalStyleItemProvider.java
index f797154f3..bbeb98dd5 100644
--- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListConditionalStyleItemProvider.java
+++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListConditionalStyleItemProvider.java
@@ -116,7 +116,7 @@ public class EEFListConditionalStyleItemProvider extends EEFConditionalStyleItem
 	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
 	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListDescriptionItemProvider.java
index 4ed93527b..284a935e5 100644
--- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListDescriptionItemProvider.java
+++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListDescriptionItemProvider.java
@@ -86,7 +86,7 @@ public class EEFListDescriptionItemProvider extends EEFWidgetDescriptionItemProv
 	/**
 	 * This adds a property descriptor for the On Click Expression feature. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
-	 * 
+	 *
 	 * @generated
 	 */
 	protected void addOnClickExpressionPropertyDescriptor(Object object) {
@@ -166,7 +166,7 @@ public class EEFListDescriptionItemProvider extends EEFWidgetDescriptionItemProv
 	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
 	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListStyleItemProvider.java
index 453fb988c..0a8383d1d 100644
--- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListStyleItemProvider.java
+++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFListStyleItemProvider.java
@@ -82,7 +82,7 @@ public class EEFListStyleItemProvider extends EEFWidgetStyleItemProvider {
 	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
 	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
-	 * 
+	 *
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFReferenceConditionalStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFReferenceConditionalStyleItemProvider.java
deleted file mode 100644
index 090f6bd1d..000000000
--- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFReferenceConditionalStyleItemProvider.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright (c) 2015 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.htm
- * Contributors: Obeo - initial API and implementation
- */
-package org.eclipse.eef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.eef.EEFReferenceConditionalStyle;
-import org.eclipse.eef.EefFactory;
-import org.eclipse.eef.EefPackage;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.eef.EEFReferenceConditionalStyle} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class EEFReferenceConditionalStyleItemProvider extends EEFConditionalStyleItemProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EEFReferenceConditionalStyleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(EefPackage.Literals.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns EEFReferenceConditionalStyle.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EEFReferenceConditionalStyle")); //$NON-NLS-1$
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((EEFReferenceConditionalStyle) object).getPreconditionExpression();
-		return label == null || label.length() == 0 ? getString("_UI_EEFReferenceConditionalStyle_type") : //$NON-NLS-1$
-			getString("_UI_EEFReferenceConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
-	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(EEFReferenceConditionalStyle.class)) {
-		case EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
-	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE,
-				EefFactory.eINSTANCE.createEEFReferenceStyle()));
-	}
-
-}
diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFReferenceDescriptionItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFReferenceDescriptionItemProvider.java
deleted file mode 100644
index 649bf4c7d..000000000
--- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFReferenceDescriptionItemProvider.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/**
- * Copyright (c) 2015 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.htm
- * Contributors: Obeo - initial API and implementation
- */
-package org.eclipse.eef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.eef.EEFReferenceDescription;
-import org.eclipse.eef.EefFactory;
-import org.eclipse.eef.EefPackage;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.eef.EEFReferenceDescription} object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class EEFReferenceDescriptionItemProvider extends EEFWidgetDescriptionItemProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EEFReferenceDescriptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addMultiplePropertyDescriptor(object);
-			addValueExpressionPropertyDescriptor(object);
-			addDisplayExpressionPropertyDescriptor(object);
-			addOnClickExpressionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Multiple feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addMultiplePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(), getString("_UI_EEFReferenceDescription_multiple_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_EEFReferenceDescription_multiple_feature", "_UI_EEFReferenceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				EefPackage.Literals.EEF_REFERENCE_DESCRIPTION__MULTIPLE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value Expression feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addValueExpressionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-		.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_EEFReferenceDescription_valueExpression_feature"), //$NON-NLS-1$
-				getString(
-						"_UI_PropertyDescriptor_description", "_UI_EEFReferenceDescription_valueExpression_feature", "_UI_EEFReferenceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						EefPackage.Literals.EEF_REFERENCE_DESCRIPTION__VALUE_EXPRESSION, true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Display Expression feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addDisplayExpressionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-		.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_EEFReferenceDescription_displayExpression_feature"), //$NON-NLS-1$
-				getString(
-						"_UI_PropertyDescriptor_description", "_UI_EEFReferenceDescription_displayExpression_feature", "_UI_EEFReferenceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						EefPackage.Literals.EEF_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION, true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the On Click Expression feature. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 *
-	 * @generated
-	 */
-	protected void addOnClickExpressionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-		.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_EEFReferenceDescription_onClickExpression_feature"), //$NON-NLS-1$
-				getString(
-						"_UI_PropertyDescriptor_description", "_UI_EEFReferenceDescription_onClickExpression_feature", "_UI_EEFReferenceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						EefPackage.Literals.EEF_REFERENCE_DESCRIPTION__ON_CLICK_EXPRESSION, true, false, false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(EefPackage.Literals.EEF_REFERENCE_DESCRIPTION__ACTIONS);
-			childrenFeatures.add(EefPackage.Literals.EEF_REFERENCE_DESCRIPTION__STYLE);
-			childrenFeatures.add(EefPackage.Literals.EEF_REFERENCE_DESCRIPTION__CONDITIONAL_STYLES);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns EEFReferenceDescription.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EEFReferenceDescription")); //$NON-NLS-1$
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((EEFReferenceDescription) object).getIdentifier();
-		return label == null || label.length() == 0 ? getString("_UI_EEFReferenceDescription_type") : //$NON-NLS-1$
-			getString("_UI_EEFReferenceDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
-	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(EEFReferenceDescription.class)) {
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__MULTIPLE:
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__VALUE_EXPRESSION:
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION:
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__ON_CLICK_EXPRESSION:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__ACTIONS:
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__STYLE:
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__CONDITIONAL_STYLES:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
-	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_REFERENCE_DESCRIPTION__ACTIONS,
-				EefFactory.eINSTANCE.createEEFWidgetAction()));
-
-		newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_REFERENCE_DESCRIPTION__STYLE,
-				EefFactory.eINSTANCE.createEEFReferenceStyle()));
-
-		newChildDescriptors.add(createChildParameter(EefPackage.Literals.EEF_REFERENCE_DESCRIPTION__CONDITIONAL_STYLES,
-				EefFactory.eINSTANCE.createEEFReferenceConditionalStyle()));
-	}
-
-}
diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFReferenceStyleItemProvider.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFReferenceStyleItemProvider.java
deleted file mode 100644
index df82e4e01..000000000
--- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EEFReferenceStyleItemProvider.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Copyright (c) 2015 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.htm
- * Contributors: Obeo - initial API and implementation
- */
-package org.eclipse.eef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.eef.EEFReferenceStyle;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.eef.EEFReferenceStyle} object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * 
- * @generated
- */
-public class EEFReferenceStyleItemProvider extends EEFWidgetStyleItemProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EEFReferenceStyleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns EEFReferenceStyle.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EEFReferenceStyle")); //$NON-NLS-1$
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		return true;
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((EEFReferenceStyle) object).getLabelFontNameExpression();
-		return label == null || label.length() == 0 ? getString("_UI_EEFReferenceStyle_type") : //$NON-NLS-1$
-			getString("_UI_EEFReferenceStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating
-	 * a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created
-	 * under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EefItemProviderAdapterFactory.java b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EefItemProviderAdapterFactory.java
index 71aa5b83d..ba9a53acb 100644
--- a/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EefItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.eef.edit/src-gen/org/eclipse/eef/provider/EefItemProviderAdapterFactory.java
@@ -571,32 +571,9 @@ IChildCreationExtender {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFReferenceDescription} instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected EEFReferenceDescriptionItemProvider eefReferenceDescriptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.eef.EEFReferenceDescription}. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Adapter createEEFReferenceDescriptionAdapter() {
-		if (eefReferenceDescriptionItemProvider == null) {
-			eefReferenceDescriptionItemProvider = new EEFReferenceDescriptionItemProvider(this);
-		}
-
-		return eefReferenceDescriptionItemProvider;
-	}
-
-	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFListDescription} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	protected EEFListDescriptionItemProvider eefListDescriptionItemProvider;
@@ -800,32 +777,9 @@ IChildCreationExtender {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFReferenceStyle} instances. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected EEFReferenceStyleItemProvider eefReferenceStyleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.eef.EEFReferenceStyle}. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Adapter createEEFReferenceStyleAdapter() {
-		if (eefReferenceStyleItemProvider == null) {
-			eefReferenceStyleItemProvider = new EEFReferenceStyleItemProvider(this);
-		}
-
-		return eefReferenceStyleItemProvider;
-	}
-
-	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFListStyle} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	protected EEFListStyleItemProvider eefListStyleItemProvider;
@@ -1075,32 +1029,9 @@ IChildCreationExtender {
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFReferenceConditionalStyle} instances.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EEFReferenceConditionalStyleItemProvider eefReferenceConditionalStyleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.eef.EEFReferenceConditionalStyle}. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public Adapter createEEFReferenceConditionalStyleAdapter() {
-		if (eefReferenceConditionalStyleItemProvider == null) {
-			eefReferenceConditionalStyleItemProvider = new EEFReferenceConditionalStyleItemProvider(this);
-		}
-
-		return eefReferenceConditionalStyleItemProvider;
-	}
-
-	/**
 	 * This keeps track of the one adapter used for all {@link org.eclipse.eef.EEFListConditionalStyle} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 *
 	 * @generated
 	 */
 	protected EEFListConditionalStyleItemProvider eefListConditionalStyleItemProvider;
@@ -1335,9 +1266,6 @@ IChildCreationExtender {
 		if (eefCustomExpressionItemProvider != null) {
 			eefCustomExpressionItemProvider.dispose();
 		}
-		if (eefReferenceDescriptionItemProvider != null) {
-			eefReferenceDescriptionItemProvider.dispose();
-		}
 		if (eefListDescriptionItemProvider != null) {
 			eefListDescriptionItemProvider.dispose();
 		}
@@ -1365,9 +1293,6 @@ IChildCreationExtender {
 		if (eefCustomWidgetStyleItemProvider != null) {
 			eefCustomWidgetStyleItemProvider.dispose();
 		}
-		if (eefReferenceStyleItemProvider != null) {
-			eefReferenceStyleItemProvider.dispose();
-		}
 		if (eefListStyleItemProvider != null) {
 			eefListStyleItemProvider.dispose();
 		}
@@ -1401,9 +1326,6 @@ IChildCreationExtender {
 		if (eefWidgetActionItemProvider != null) {
 			eefWidgetActionItemProvider.dispose();
 		}
-		if (eefReferenceConditionalStyleItemProvider != null) {
-			eefReferenceConditionalStyleItemProvider.dispose();
-		}
 		if (eefListConditionalStyleItemProvider != null) {
 			eefListConditionalStyleItemProvider.dispose();
 		}
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 e5c9d6faf..befa4dfff 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
@@ -27,7 +27,6 @@ import org.eclipse.eef.EEFHyperlinkDescription;
 import org.eclipse.eef.EEFLabelDescription;
 import org.eclipse.eef.EEFListDescription;
 import org.eclipse.eef.EEFRadioDescription;
-import org.eclipse.eef.EEFReferenceDescription;
 import org.eclipse.eef.EEFSelectDescription;
 import org.eclipse.eef.EEFTextDescription;
 import org.eclipse.eef.EEFWidgetDescription;
@@ -198,21 +197,6 @@ public class EEFControlSwitch {
 				eefButtonLifecycleManager.createControl(parent, formContainer);
 
 				lifecycleManagers.add(eefButtonLifecycleManager);
-			} else if (widgetDescription instanceof EEFReferenceDescription) {
-				EEFReferenceDescription eefReferenceDescription = (EEFReferenceDescription) widgetDescription;
-
-				IEEFLifecycleManager eefReferenceLifecycleManager = null;
-				if (eefReferenceDescription.isMultiple()) {
-					eefReferenceLifecycleManager = new EEFMultipleReferencesLifecycleManager(eefReferenceDescription, childVariableManager,
-							interpreter, contextAdapter);
-				} else {
-					eefReferenceLifecycleManager = new EEFReferenceLifecycleManager(eefReferenceDescription, childVariableManager, interpreter,
-							contextAdapter);
-				}
-
-				eefReferenceLifecycleManager.createControl(parent, formContainer);
-
-				lifecycleManagers.add(eefReferenceLifecycleManager);
 			} else if (widgetDescription instanceof EEFListDescription) {
 				EEFListDescription eefListDescription = (EEFListDescription) widgetDescription;
 
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFMultipleReferencesLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFMultipleReferencesLifecycleManager.java
deleted file mode 100644
index 1c620caa1..000000000
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFMultipleReferencesLifecycleManager.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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.ide.ui.internal.widgets;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.eef.EEFReferenceDescription;
-import org.eclipse.eef.EEFWidgetAction;
-import org.eclipse.eef.EEFWidgetDescription;
-import org.eclipse.eef.common.ui.api.EEFWidgetFactory;
-import org.eclipse.eef.common.ui.api.IEEFFormContainer;
-import org.eclipse.eef.core.api.EditingContextAdapter;
-import org.eclipse.eef.core.api.controllers.EEFControllersFactory;
-import org.eclipse.eef.core.api.controllers.IConsumer;
-import org.eclipse.eef.core.api.controllers.IEEFReferenceController;
-import org.eclipse.eef.core.api.controllers.IEEFWidgetController;
-import org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.sirius.common.interpreter.api.IInterpreter;
-import org.eclipse.sirius.common.interpreter.api.IVariableManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-
-/**
- * This class will be used in order to manager the lifecycle of a multiple references widget.
- *
- * @author sbegaudeau
- */
-public class EEFMultipleReferencesLifecycleManager extends AbstractEEFWidgetLifecycleManager {
-	/**
-	 * Default height.
-	 */
-	private static final int DEFAULT_HEIGHT = 34;
-
-	/**
-	 * Minimal height of the table widget.
-	 */
-	private static final int TABLE_MINIMAL_HEIGHT = 100;
-
-	/**
-	 * The description.
-	 */
-	private EEFReferenceDescription description;
-
-	/**
-	 * The widget factory.
-	 */
-	private EEFWidgetFactory widgetFactory;
-
-	/**
-	 * The action buttons.
-	 */
-	private List<ActionButton> actionButtons = new ArrayList<ActionButton>();
-
-	/**
-	 * The default background color of the text field.
-	 */
-	private Color defaultBackgroundColor;
-
-	/**
-	 * The controller.
-	 */
-	private IEEFReferenceController controller;
-
-	/**
-	 * The table viewer used to display the references.
-	 */
-	private TableViewer tableViewer;
-
-	/**
-	 * The listener used to run the onClick expression when the user will click on the table.
-	 */
-	private SelectionListener tableSelectionListener;
-
-	/**
-	 * The constructor.
-	 *
-	 * @param description
-	 *            The description
-	 * @param variableManager
-	 *            The variable manager
-	 * @param interpreter
-	 *            The interpreter
-	 * @param contextAdapter
-	 *            The editing context adapter
-	 */
-	public EEFMultipleReferencesLifecycleManager(EEFReferenceDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter, contextAdapter);
-		this.description = description;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager#createMainControl(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.eef.common.ui.api.IEEFFormContainer)
-	 */
-	@Override
-	protected void createMainControl(Composite parent, IEEFFormContainer formContainer) {
-		widgetFactory = formContainer.getWidgetFactory();
-		defaultBackgroundColor = parent.getBackground();
-
-		// this is the parent composite
-		Composite reference = widgetFactory.createFlatFormComposite(parent);
-		GridLayout layout = new GridLayout(2, false);
-		reference.setLayout(layout);
-
-		GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
-		reference.setLayoutData(gridData);
-
-		this.createMultipleValuedReferenceWidget(reference);
-		this.createWidgetActionButtons(reference);
-
-		widgetFactory.paintBordersFor(parent);
-
-		this.controller = new EEFControllersFactory().createReferenceController(this.description, this.variableManager, this.interpreter,
-				this.contextAdapter);
-	}
-
-	/**
-	 * Create table widget.
-	 *
-	 * @param parent
-	 *            The parent composite
-	 */
-	private void createMultipleValuedReferenceWidget(Composite parent) {
-		ScrolledComposite scrolledComposite = widgetFactory.createScrolledComposite(parent, SWT.NONE);
-		GridData gridData = new GridData();
-		gridData.grabExcessHorizontalSpace = true;
-		gridData.horizontalAlignment = SWT.FILL;
-		scrolledComposite.setLayoutData(gridData);
-
-		Table table = widgetFactory.createTable(scrolledComposite, SWT.READ_ONLY | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER | SWT.MULTI);
-		this.tableViewer = new TableViewer(table);
-
-		GridData tableGridData = new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1);
-		tableGridData.horizontalIndent = VALIDATION_MARKER_OFFSET;
-		this.tableViewer.getTable().setLayoutData(tableGridData);
-
-		this.tableViewer.setContentProvider(ArrayContentProvider.getInstance());
-		this.tableViewer.setLabelProvider(new EEFMultipleReferencesTableLabelProvider(this.description, this.interpreter, this.variableManager));
-
-		scrolledComposite.setContent(table);
-
-		int widgetHeight = DEFAULT_HEIGHT;
-		List<EEFWidgetAction> actions = description.getActions();
-		if (actions != null && actions.size() > 0) {
-			widgetHeight = widgetHeight * (actions.size() + 1);
-		}
-
-		final int clientWidth = scrolledComposite.getClientArea().width;
-		this.tableViewer.getTable().setSize(clientWidth, Math.max(TABLE_MINIMAL_HEIGHT, widgetHeight));
-
-		scrolledComposite.setExpandHorizontal(true);
-		scrolledComposite.setAlwaysShowScrollBars(true);
-	}
-
-	/**
-	 * Create widget action buttons.
-	 *
-	 * @param parent
-	 *            The parent composite
-	 */
-	private void createWidgetActionButtons(Composite parent) {
-		Composite buttons = widgetFactory.createFlatFormComposite(parent);
-
-		GridData gridData = new GridData();
-		buttons.setLayoutData(gridData);
-
-		buttons.setLayout(new GridLayout(1, false));
-
-		// Buttons are visible only if an action is defined
-		for (EEFWidgetAction action : this.description.getActions()) {
-			ActionButton actionButton = new ActionButton(action, buttons, widgetFactory, this.interpreter, this.variableManager);
-			actionButtons.add(actionButton);
-		}
-
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager#aboutToBeShown()
-	 */
-	@Override
-	public void aboutToBeShown() {
-		super.aboutToBeShown();
-
-		this.tableSelectionListener = new EEFMultipleReferencesSelectionListener(this.controller);
-		this.tableViewer.getTable().addSelectionListener(tableSelectionListener);
-
-		this.controller.onNewValue(new IConsumer<Object>() {
-			@Override
-			public void apply(Object value) {
-				if (value == null) {
-					return;
-				}
-				setMultipleValuedReference(value);
-			}
-		});
-
-		for (final ActionButton actionButton : actionButtons) {
-			SelectionAdapter selectionListener = new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					List<Object> selections = new ArrayList<Object>();
-					IStructuredSelection structuredSelection = (IStructuredSelection) tableViewer.getSelection();
-					for (Object selection : structuredSelection.toList()) {
-						selections.add(selection);
-					}
-					controller.action(actionButton.getAction(), selections);
-				}
-			};
-
-			actionButton.addSelectionListener(selectionListener);
-		}
-	}
-
-	/**
-	 * Set multiple valued reference.
-	 *
-	 * @param value
-	 *            Value to select
-	 */
-	private void setMultipleValuedReference(Object value) {
-		if (!this.tableViewer.getTable().isDisposed()) {
-			final ISelection selection = new StructuredSelection(value);
-			tableViewer.setSelection(selection);
-
-			List<Object> values = new ArrayList<Object>();
-			if (value instanceof Iterable<?>) {
-				for (Object val : (Iterable<?>) value) {
-					values.add(val);
-				}
-			} else {
-				values.add(value);
-			}
-			tableViewer.setInput(values.toArray());
-			if (!this.tableViewer.getTable().isEnabled() && this.isEnabled()) {
-				this.tableViewer.getTable().setEnabled(true);
-			}
-		}
-	}
-
-	/**
-	 * Get the background color according to the current valid style.
-	 *
-	 * @return The background color to use in the text field.
-	 */
-	private Color getBackgroundColor() {
-		Color color = defaultBackgroundColor;
-		if (!isEnabled()) {
-			color = widgetFactory.getColors().getInactiveBackground();
-		}
-		return color;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFLifecycleManager#refresh()
-	 */
-	@Override
-	public void refresh() {
-		super.refresh();
-
-		if (this.tableViewer != null && this.tableViewer.getTable() != null) {
-			this.tableViewer.getTable().setBackground(getBackgroundColor());
-		}
-
-		for (ActionButton actionButton : this.actionButtons) {
-			actionButton.setEnabled(this.isEnabled());
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager#aboutToBeHidden()
-	 */
-	@Override
-	public void aboutToBeHidden() {
-		super.aboutToBeHidden();
-
-		for (ActionButton actionButton : this.actionButtons) {
-			actionButton.removeSelectionListener();
-		}
-
-		if (this.tableViewer != null && this.tableViewer.getTable() != null && !this.tableViewer.getTable().isDisposed()) {
-			this.tableViewer.getTable().removeSelectionListener(this.tableSelectionListener);
-		}
-		this.controller.removeNewValueConsumer();
-		this.actionButtons.clear();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager#getController()
-	 */
-	@Override
-	protected IEEFWidgetController getController() {
-		return this.controller;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager#getWidgetDescription()
-	 */
-	@Override
-	protected EEFWidgetDescription getWidgetDescription() {
-		return this.description;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFLifecycleManager#getValidationControl()
-	 */
-	@Override
-	protected Control getValidationControl() {
-		return this.tableViewer.getTable().getParent();
-	}
-}
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFMultipleReferencesSelectionListener.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFMultipleReferencesSelectionListener.java
deleted file mode 100644
index e520662d7..000000000
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFMultipleReferencesSelectionListener.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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.ide.ui.internal.widgets;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.eef.core.api.EEFExpressionUtils;
-import org.eclipse.eef.core.api.controllers.IEEFReferenceController;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * This class is used to call the controller once the end user click on the table.
- *
- * @author sbegaudeau
- */
-public class EEFMultipleReferencesSelectionListener implements SelectionListener {
-
-	/**
-	 * The controller.
-	 */
-	private IEEFReferenceController controller;
-
-	/**
-	 * The constructor.
-	 *
-	 * @param controller
-	 *            The controller
-	 */
-	public EEFMultipleReferencesSelectionListener(IEEFReferenceController controller) {
-		this.controller = controller;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-	@Override
-	public void widgetSelected(SelectionEvent event) {
-		this.triggerOnClick(event, EEFExpressionUtils.EEFReference.SINGLE_CLICK);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
-	@Override
-	public void widgetDefaultSelected(SelectionEvent event) {
-		this.triggerOnClick(event, EEFExpressionUtils.EEFReference.DOUBLE_CLICK);
-	}
-
-	/**
-	 * Triggers the on click operation of the controller.
-	 * 
-	 * @param event
-	 *            The event
-	 * @param onClickEventKind
-	 *            The kind of click realized by the end user
-	 */
-	private void triggerOnClick(SelectionEvent event, String onClickEventKind) {
-		Object source = event.getSource();
-		if (source instanceof Table) {
-			Table table = (Table) source;
-			TableItem[] selection = table.getSelection();
-			if (selection != null) {
-				List<Object> data = new ArrayList<Object>();
-				for (TableItem tableItem : selection) {
-					data.add(tableItem.getData());
-				}
-				this.controller.onClick(data, onClickEventKind);
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFMultipleReferencesTableLabelProvider.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFMultipleReferencesTableLabelProvider.java
deleted file mode 100644
index a3ad1fe76..000000000
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFMultipleReferencesTableLabelProvider.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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.ide.ui.internal.widgets;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.eef.EEFReferenceDescription;
-import org.eclipse.eef.EefPackage;
-import org.eclipse.eef.core.api.EEFExpressionUtils;
-import org.eclipse.eef.core.api.utils.EvalFactory;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.jface.viewers.StyledCellLabelProvider;
-import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.sirius.common.interpreter.api.IInterpreter;
-import org.eclipse.sirius.common.interpreter.api.IVariableManager;
-
-/**
- * Multiple references widget label provider.
- *
- * @author mbats
- */
-final class EEFMultipleReferencesTableLabelProvider extends StyledCellLabelProvider {
-
-	/**
-	 * The description.
-	 */
-	private EEFReferenceDescription description;
-
-	/**
-	 * The interpreter.
-	 */
-	private IInterpreter interpreter;
-
-	/**
-	 * The variable manager.
-	 */
-	private IVariableManager variableManager;
-
-	/**
-	 * The constructor.
-	 *
-	 * @param description
-	 *            The description
-	 * @param interpreter
-	 *            The interpreter
-	 * @param variableManager
-	 *            The variable manager
-	 */
-	public EEFMultipleReferencesTableLabelProvider(EEFReferenceDescription description, IInterpreter interpreter, IVariableManager variableManager) {
-		this.description = description;
-		this.interpreter = interpreter;
-		this.variableManager = variableManager;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.jface.viewers.StyledCellLabelProvider#update(org.eclipse.jface.viewers.ViewerCell)
-	 */
-	@Override
-	public void update(ViewerCell cell) {
-		Object element = cell.getElement();
-		Map<String, Object> variables = new HashMap<String, Object>();
-		variables.putAll(this.variableManager.getVariables());
-		variables.put(EEFExpressionUtils.EEFReference.VALUE, element);
-
-		String expression = this.description.getDisplayExpression();
-		EAttribute eAttribute = EefPackage.Literals.EEF_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION;
-		String value = EvalFactory.of(this.interpreter, variables).logIfInvalidType(String.class).logIfBlank(eAttribute).evaluate(expression);
-		cell.setText(value);
-		super.update(cell);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFReferenceHyperlinkListener.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFReferenceHyperlinkListener.java
deleted file mode 100644
index 418f70c1a..000000000
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFReferenceHyperlinkListener.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 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.ide.ui.internal.widgets;
-
-import org.eclipse.eef.core.api.EEFExpressionUtils;
-import org.eclipse.eef.core.api.controllers.IEEFReferenceController;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-
-/**
- * This class will be used to run the onClick expression once the used click on the hyperlink.
- *
- * @author sbegaudeau
- */
-public class EEFReferenceHyperlinkListener implements IHyperlinkListener {
-
-	/**
-	 * The controller.
-	 */
-	private IEEFReferenceController controller;
-
-	/**
-	 * The constructor.
-	 *
-	 * @param controller
-	 *            The controller
-	 */
-	public EEFReferenceHyperlinkListener(IEEFReferenceController controller) {
-		this.controller = controller;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.ui.forms.events.IHyperlinkListener#linkEntered(org.eclipse.ui.forms.events.HyperlinkEvent)
-	 */
-	@Override
-	public void linkEntered(HyperlinkEvent event) {
-		// Do nothing
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.ui.forms.events.IHyperlinkListener#linkExited(org.eclipse.ui.forms.events.HyperlinkEvent)
-	 */
-	@Override
-	public void linkExited(HyperlinkEvent event) {
-		// Do nothing
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.ui.forms.events.IHyperlinkListener#linkActivated(org.eclipse.ui.forms.events.HyperlinkEvent)
-	 */
-	@Override
-	public void linkActivated(HyperlinkEvent event) {
-		Hyperlink link = (Hyperlink) event.getSource();
-		if (link != null) {
-			Object element = link.getData();
-			this.controller.onClick(element, EEFExpressionUtils.EEFReference.SINGLE_CLICK);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFReferenceLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFReferenceLifecycleManager.java
deleted file mode 100644
index 8d3a29938..000000000
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFReferenceLifecycleManager.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2016 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.ide.ui.internal.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.eef.EEFReferenceDescription;
-import org.eclipse.eef.EEFWidgetAction;
-import org.eclipse.eef.EEFWidgetDescription;
-import org.eclipse.eef.common.api.utils.Util;
-import org.eclipse.eef.common.ui.api.EEFWidgetFactory;
-import org.eclipse.eef.common.ui.api.IEEFFormContainer;
-import org.eclipse.eef.core.api.EEFExpressionUtils;
-import org.eclipse.eef.core.api.EditingContextAdapter;
-import org.eclipse.eef.core.api.controllers.EEFControllersFactory;
-import org.eclipse.eef.core.api.controllers.IConsumer;
-import org.eclipse.eef.core.api.controllers.IEEFReferenceController;
-import org.eclipse.eef.core.api.controllers.IEEFWidgetController;
-import org.eclipse.eef.core.api.utils.EvalFactory;
-import org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager;
-import org.eclipse.sirius.common.interpreter.api.IInterpreter;
-import org.eclipse.sirius.common.interpreter.api.IVariableManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-
-/**
- * This class will be used in order to manage the lifecycle of a reference widget.
- *
- * @author mbats
- */
-public class EEFReferenceLifecycleManager extends AbstractEEFWidgetLifecycleManager {
-
-	/**
-	 * Default height.
-	 */
-	private static final int DEFAULT_HEIGHT = 34;
-
-	/**
-	 * The description.
-	 */
-	private EEFReferenceDescription description;
-
-	/**
-	 * The text.
-	 */
-	private Hyperlink hyperlink;
-
-	/**
-	 * The text.
-	 */
-	private Label text;
-
-	/**
-	 * The action buttons.
-	 */
-	private List<ActionButton> actionButtons = new ArrayList<ActionButton>();
-
-	/**
-	 * The controller.
-	 */
-	private IEEFReferenceController controller;
-
-	/**
-	 * The listener on the text.
-	 */
-	private IHyperlinkListener onClickListener;
-
-	/**
-	 * The widget factory.
-	 */
-	private EEFWidgetFactory widgetFactory;
-
-	/**
-	 * The default background color of the text field.
-	 */
-	private Color defaultBackgroundColor;
-
-	/**
-	 * The constructor.
-	 *
-	 * @param description
-	 *            The description
-	 * @param variableManager
-	 *            The variable manager
-	 * @param interpreter
-	 *            The interpreter
-	 * @param contextAdapter
-	 *            The editing context adapter
-	 */
-	public EEFReferenceLifecycleManager(EEFReferenceDescription description, IVariableManager variableManager, IInterpreter interpreter,
-			EditingContextAdapter contextAdapter) {
-		super(variableManager, interpreter, contextAdapter);
-		this.description = description;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager#createMainControl(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.eef.common.ui.api.IEEFFormContainer)
-	 */
-	@Override
-	protected void createMainControl(Composite parent, IEEFFormContainer formContainer) {
-		widgetFactory = formContainer.getWidgetFactory();
-		defaultBackgroundColor = parent.getBackground();
-
-		// this is the parent composite
-		Composite reference = widgetFactory.createFlatFormComposite(parent);
-		GridLayout layout = new GridLayout(2, false);
-		reference.setLayout(layout);
-
-		GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
-		reference.setLayoutData(gridData);
-
-		this.createSingleValuedReferenceWidget(reference);
-		this.createWidgetActionButtons(reference);
-
-		widgetFactory.paintBordersFor(parent);
-
-		this.controller = new EEFControllersFactory().createReferenceController(this.description, this.variableManager, this.interpreter,
-				this.contextAdapter);
-	}
-
-	/**
-	 * Create widget action buttons.
-	 *
-	 * @param parent
-	 *            The parent composite
-	 */
-	private void createWidgetActionButtons(Composite parent) {
-		Composite buttons = widgetFactory.createFlatFormComposite(parent);
-
-		GridData gridData = new GridData();
-		gridData.grabExcessHorizontalSpace = false;
-		buttons.setLayoutData(gridData);
-
-		buttons.setLayout(new GridLayout(this.description.getActions().size(), true));
-
-		// Buttons are visible only if an action is defined
-		for (EEFWidgetAction action : this.description.getActions()) {
-			ActionButton actionButton = new ActionButton(action, buttons, widgetFactory, this.interpreter, this.variableManager);
-			actionButtons.add(actionButton);
-		}
-
-	}
-
-	/**
-	 * Create a single valued reference widget : a text field or a label field if the onclick expression exists.
-	 *
-	 * @param parent
-	 *            The parent composite
-	 */
-	private void createSingleValuedReferenceWidget(Composite parent) {
-		GridData gridData = new GridData();
-		gridData.grabExcessHorizontalSpace = true;
-		gridData.horizontalAlignment = SWT.FILL;
-
-		// Use hyperlink if the onclick expression exists
-		final int clientWidth = parent.getClientArea().width;
-		if (!Util.isBlank(this.description.getOnClickExpression())) {
-			this.hyperlink = widgetFactory.createHyperlink(parent, "", SWT.NONE); //$NON-NLS-1$
-			hyperlink.setLayoutData(gridData);
-			hyperlink.setSize(clientWidth, DEFAULT_HEIGHT);
-		} else {
-			this.text = widgetFactory.createLabel(parent, "", SWT.NONE); //$NON-NLS-1$
-			text.setLayoutData(gridData);
-			text.setSize(clientWidth, DEFAULT_HEIGHT);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.internal.widgets.AbstractEEFWidgetLifecycleManager#getController()
-	 */
-	@Override
-	protected IEEFWidgetController getController() {
-		return this.controller;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager#aboutToBeShown()
-	 */
-	@Override
-	public void aboutToBeShown() {
-		super.aboutToBeShown();
-		if (this.hyperlink != null) {
-			this.onClickListener = new EEFReferenceHyperlinkListener(this.controller);
-			this.hyperlink.addHyperlinkListener(this.onClickListener);
-		}
-
-		this.controller.onNewValue(new IConsumer<Object>() {
-			@Override
-			public void apply(Object value) {
-				if (value == null) {
-					return;
-				}
-				EEFReferenceLifecycleManager.this.setSingleValuedReference(value);
-			}
-		});
-
-		for (final ActionButton actionButton : actionButtons) {
-			SelectionAdapter selectionListener = new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					List<Object> selections = new ArrayList<Object>();
-					if (EEFReferenceLifecycleManager.this.hyperlink != null) {
-						selections.add(EEFReferenceLifecycleManager.this.hyperlink.getData());
-					} else {
-						selections.add(EEFReferenceLifecycleManager.this.text.getData());
-					}
-					controller.action(actionButton.getAction(), selections);
-				}
-			};
-
-			actionButton.addSelectionListener(selectionListener);
-		}
-	}
-
-	/**
-	 * Set single valued reference.
-	 *
-	 * @param value
-	 *            Value to set
-	 */
-	private void setSingleValuedReference(Object value) {
-		String expression = description.getDisplayExpression();
-
-		Map<String, Object> variables = new HashMap<String, Object>();
-		variables.putAll(this.variableManager.getVariables());
-		variables.put(EEFExpressionUtils.EEFReference.VALUE, value);
-		String display = EvalFactory.of(EEFReferenceLifecycleManager.this.interpreter, variables).logIfInvalidType(String.class).evaluate(expression);
-
-		if (!Util.isBlank(display)) {
-			if (hyperlink != null && !hyperlink.isDisposed() && !(hyperlink.getText() != null && hyperlink.getText().equals(value))) {
-				hyperlink.setText(display);
-				hyperlink.setData(value);
-				if (!hyperlink.isEnabled() && this.isEnabled()) {
-					hyperlink.setEnabled(true);
-				}
-			} else if (text != null && !text.isDisposed() && !(text.getText() != null && text.getText().equals(value))) {
-				text.setText(display);
-				text.setData(value);
-				if (!text.isEnabled() && this.isEnabled()) {
-					text.setEnabled(true);
-				}
-			}
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.internal.widgets.AbstractEEFWidgetLifecycleManager#getValidationControl()
-	 */
-	@Override
-	protected Control getValidationControl() {
-		if (this.hyperlink != null) {
-			return this.hyperlink;
-		}
-		return this.text;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.internal.widgets.AbstractEEFWidgetLifecycleManager#aboutToBeHidden()
-	 */
-	@Override
-	public void aboutToBeHidden() {
-		super.aboutToBeHidden();
-
-		if (this.hyperlink != null && !this.hyperlink.isDisposed()) {
-			this.hyperlink.removeHyperlinkListener(this.onClickListener);
-		}
-
-		for (ActionButton actionButton : this.actionButtons) {
-			actionButton.removeSelectionListener();
-		}
-
-		this.controller.removeNewValueConsumer();
-		this.actionButtons.clear();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.internal.widgets.AbstractEEFWidgetLifecycleManager#getWidgetDescription()
-	 */
-	@Override
-	protected EEFWidgetDescription getWidgetDescription() {
-		return this.description;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager#getLabelVerticalAlignment()
-	 */
-	@Override
-	protected int getLabelVerticalAlignment() {
-		if (!description.isMultiple()) {
-			return GridData.VERTICAL_ALIGN_CENTER;
-		}
-		return super.getLabelVerticalAlignment();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.eef.ide.ui.api.widgets.AbstractEEFWidgetLifecycleManager#refresh()
-	 */
-	@Override
-	public void refresh() {
-		super.refresh();
-		if (this.text != null) {
-			this.text.setEnabled(isEnabled());
-			this.text.setBackground(getBackgroundColor());
-		} else if (this.hyperlink != null) {
-			this.hyperlink.setEnabled(isEnabled());
-			this.hyperlink.setBackground(getBackgroundColor());
-		}
-
-		for (ActionButton actionButton : this.actionButtons) {
-			actionButton.setEnabled(this.isEnabled());
-		}
-	}
-
-	/**
-	 * Get the background color according to the current valid style.
-	 *
-	 * @return The background color to use in the text field.
-	 */
-	private Color getBackgroundColor() {
-		Color color = defaultBackgroundColor;
-		if (!isEnabled()) {
-			color = widgetFactory.getColors().getInactiveBackground();
-		}
-		return color;
-	}
-}
diff --git a/plugins/org.eclipse.eef/model/eef.ecore b/plugins/org.eclipse.eef/model/eef.ecore
index 52ceecb32..35faff5e7 100644
--- a/plugins/org.eclipse.eef/model/eef.ecore
+++ b/plugins/org.eclipse.eef/model/eef.ecore
@@ -588,45 +588,6 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EEFReferenceDescription" eSuperTypes="#//EEFWidgetDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents a reference field in the user interface."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiple" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Represents a mutliple values reference."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueExpression" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the input value."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayExpression" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Indicates how to display the input value."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="onClickExpression" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the behavior related to the onclick action."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="actions" upperBound="-1"
-        eType="#//EEFWidgetAction" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//EEFReferenceStyle"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the radio style"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionalStyles" upperBound="-1"
-        eType="#//EEFReferenceConditionalStyle" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the reference style associated to a precondition"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EEFListDescription" eSuperTypes="#//EEFWidgetDescription">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Represents a list in the user interface."/>
@@ -811,11 +772,6 @@
       <details key="documentation" value="Represents a style that can be applied on custom widgets."/>
     </eAnnotations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EEFReferenceStyle" eSuperTypes="#//EEFWidgetStyle">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents a style that can be applied on reference widgets."/>
-    </eAnnotations>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EEFListStyle" eSuperTypes="#//EEFWidgetStyle">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Represents a style that can be applied on list widgets."/>
@@ -920,13 +876,6 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EEFReferenceConditionalStyle" eSuperTypes="#//EEFConditionalStyle">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents a conditional style that can be applied on reference widgets."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//EEFReferenceStyle"
-        containment="true"/>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EEFListConditionalStyle" eSuperTypes="#//EEFConditionalStyle">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Represents a conditional style that can be applied on list widgets."/>
diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFReferenceConditionalStyle.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFReferenceConditionalStyle.java
deleted file mode 100644
index e774b2e3b..000000000
--- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFReferenceConditionalStyle.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Copyright (c) 2015 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.htm
- * Contributors: Obeo - initial API and implementation
- */
-package org.eclipse.eef;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>EEF Reference Conditional Style</b></em>'. <!--
- * end-user-doc -->
- *
- * <!-- begin-model-doc --> Represents a conditional style that can be applied on reference widgets. <!-- end-model-doc
- * -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.eef.EEFReferenceConditionalStyle#getStyle <em>Style</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.eef.EefPackage#getEEFReferenceConditionalStyle()
- * @model
- * @generated
- */
-public interface EEFReferenceConditionalStyle extends EEFConditionalStyle {
-	/**
-	 * Returns the value of the '<em><b>Style</b></em>' containment reference. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Style</em>' containment reference isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Style</em>' containment reference.
-	 * @see #setStyle(EEFReferenceStyle)
-	 * @see org.eclipse.eef.EefPackage#getEEFReferenceConditionalStyle_Style()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EEFReferenceStyle getStyle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.eef.EEFReferenceConditionalStyle#getStyle <em>Style</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Style</em>' containment reference.
-	 * @see #getStyle()
-	 * @generated
-	 */
-	void setStyle(EEFReferenceStyle value);
-
-} // EEFReferenceConditionalStyle
diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFReferenceDescription.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFReferenceDescription.java
deleted file mode 100644
index aad972c39..000000000
--- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFReferenceDescription.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * Copyright (c) 2015 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.htm
- * Contributors: Obeo - initial API and implementation
- */
-package org.eclipse.eef;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>EEF Reference Description</b></em>'. <!--
- * end-user-doc -->
- *
- * <!-- begin-model-doc --> Represents a reference field in the user interface. <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.eef.EEFReferenceDescription#isMultiple <em>Multiple</em>}</li>
- * <li>{@link org.eclipse.eef.EEFReferenceDescription#getValueExpression <em>Value Expression</em>}</li>
- * <li>{@link org.eclipse.eef.EEFReferenceDescription#getDisplayExpression <em>Display Expression</em>}</li>
- * <li>{@link org.eclipse.eef.EEFReferenceDescription#getOnClickExpression <em>On Click Expression</em>}</li>
- * <li>{@link org.eclipse.eef.EEFReferenceDescription#getActions <em>Actions</em>}</li>
- * <li>{@link org.eclipse.eef.EEFReferenceDescription#getStyle <em>Style</em>}</li>
- * <li>{@link org.eclipse.eef.EEFReferenceDescription#getConditionalStyles <em>Conditional Styles</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.eef.EefPackage#getEEFReferenceDescription()
- * @model
- * @generated
- */
-public interface EEFReferenceDescription extends EEFWidgetDescription {
-	/**
-	 * Returns the value of the '<em><b>Multiple</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
-	 * begin-model-doc --> Represents a mutliple values reference. <!-- end-model-doc -->
-	 *
-	 * @return the value of the '<em>Multiple</em>' attribute.
-	 * @see #setMultiple(boolean)
-	 * @see org.eclipse.eef.EefPackage#getEEFReferenceDescription_Multiple()
-	 * @model
-	 * @generated
-	 */
-	boolean isMultiple();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.eef.EEFReferenceDescription#isMultiple <em>Multiple</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Multiple</em>' attribute.
-	 * @see #isMultiple()
-	 * @generated
-	 */
-	void setMultiple(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Value Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * --> <!-- begin-model-doc --> Defines the input value. <!-- end-model-doc -->
-	 *
-	 * @return the value of the '<em>Value Expression</em>' attribute.
-	 * @see #setValueExpression(String)
-	 * @see org.eclipse.eef.EefPackage#getEEFReferenceDescription_ValueExpression()
-	 * @model
-	 * @generated
-	 */
-	String getValueExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.eef.EEFReferenceDescription#getValueExpression
-	 * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Value Expression</em>' attribute.
-	 * @see #getValueExpression()
-	 * @generated
-	 */
-	void setValueExpression(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
-	 * end-user-doc --> <!-- begin-model-doc --> Indicates how to display the input value. <!-- end-model-doc -->
-	 *
-	 * @return the value of the '<em>Display Expression</em>' attribute.
-	 * @see #setDisplayExpression(String)
-	 * @see org.eclipse.eef.EefPackage#getEEFReferenceDescription_DisplayExpression()
-	 * @model
-	 * @generated
-	 */
-	String getDisplayExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.eef.EEFReferenceDescription#getDisplayExpression
-	 * <em>Display Expression</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Display Expression</em>' attribute.
-	 * @see #getDisplayExpression()
-	 * @generated
-	 */
-	void setDisplayExpression(String value);
-
-	/**
-	 * Returns the value of the '<em><b>On Click Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
-	 * end-user-doc --> <!-- begin-model-doc --> Defines the behavior related to the onclick action. <!-- end-model-doc
-	 * -->
-	 *
-	 * @return the value of the '<em>On Click Expression</em>' attribute.
-	 * @see #setOnClickExpression(String)
-	 * @see org.eclipse.eef.EefPackage#getEEFReferenceDescription_OnClickExpression()
-	 * @model
-	 * @generated
-	 */
-	String getOnClickExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.eef.EEFReferenceDescription#getOnClickExpression
-	 * <em>On Click Expression</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>On Click Expression</em>' attribute.
-	 * @see #getOnClickExpression()
-	 * @generated
-	 */
-	void setOnClickExpression(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Actions</b></em>' containment reference list. The list contents are of type
-	 * {@link org.eclipse.eef.EEFWidgetAction}. <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Actions</em>' containment reference list isn't clear, there really should be more of a
-	 * description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Actions</em>' containment reference list.
-	 * @see org.eclipse.eef.EefPackage#getEEFReferenceDescription_Actions()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<EEFWidgetAction> getActions();
-
-	/**
-	 * Returns the value of the '<em><b>Style</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
-	 * --> <!-- begin-model-doc --> Defines the radio style <!-- end-model-doc -->
-	 *
-	 * @return the value of the '<em>Style</em>' containment reference.
-	 * @see #setStyle(EEFReferenceStyle)
-	 * @see org.eclipse.eef.EefPackage#getEEFReferenceDescription_Style()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EEFReferenceStyle getStyle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.eef.EEFReferenceDescription#getStyle <em>Style</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Style</em>' containment reference.
-	 * @see #getStyle()
-	 * @generated
-	 */
-	void setStyle(EEFReferenceStyle value);
-
-	/**
-	 * Returns the value of the '<em><b>Conditional Styles</b></em>' containment reference list. The list contents are
-	 * of type {@link org.eclipse.eef.EEFReferenceConditionalStyle}. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
-	 * begin-model-doc --> Defines the reference style associated to a precondition <!-- end-model-doc -->
-	 *
-	 * @return the value of the '<em>Conditional Styles</em>' containment reference list.
-	 * @see org.eclipse.eef.EefPackage#getEEFReferenceDescription_ConditionalStyles()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	EList<EEFReferenceConditionalStyle> getConditionalStyles();
-
-} // EEFReferenceDescription
diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFReferenceStyle.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFReferenceStyle.java
deleted file mode 100644
index 17e4d5aba..000000000
--- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EEFReferenceStyle.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) 2015 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.htm
- * Contributors: Obeo - initial API and implementation
- */
-package org.eclipse.eef;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>EEF Reference Style</b></em>'. <!-- end-user-doc
- * -->
- *
- * <!-- begin-model-doc --> Represents a style that can be applied on reference widgets. <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.eef.EefPackage#getEEFReferenceStyle()
- * @model
- * @generated
- */
-public interface EEFReferenceStyle extends EEFWidgetStyle {
-} // EEFReferenceStyle
diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefFactory.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefFactory.java
index d17a85551..e20aa7b9f 100644
--- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefFactory.java
+++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefFactory.java
@@ -201,14 +201,6 @@ public interface EefFactory extends EFactory {
 	EEFCustomExpression createEEFCustomExpression();
 
 	/**
-	 * Returns a new object of class '<em>EEF Reference Description</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>EEF Reference Description</em>'.
-	 * @generated
-	 */
-	EEFReferenceDescription createEEFReferenceDescription();
-
-	/**
 	 * Returns a new object of class '<em>EEF List Description</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @return a new object of class '<em>EEF List Description</em>'.
@@ -281,14 +273,6 @@ public interface EefFactory extends EFactory {
 	EEFCustomWidgetStyle createEEFCustomWidgetStyle();
 
 	/**
-	 * Returns a new object of class '<em>EEF Reference Style</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>EEF Reference Style</em>'.
-	 * @generated
-	 */
-	EEFReferenceStyle createEEFReferenceStyle();
-
-	/**
 	 * Returns a new object of class '<em>EEF List Style</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @return a new object of class '<em>EEF List Style</em>'.
@@ -385,15 +369,6 @@ public interface EefFactory extends EFactory {
 	EEFWidgetAction createEEFWidgetAction();
 
 	/**
-	 * Returns a new object of class '<em>EEF Reference Conditional Style</em>'. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @return a new object of class '<em>EEF Reference Conditional Style</em>'.
-	 * @generated
-	 */
-	EEFReferenceConditionalStyle createEEFReferenceConditionalStyle();
-
-	/**
 	 * Returns a new object of class '<em>EEF List Conditional Style</em>'. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 *
diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefPackage.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefPackage.java
index 39996573d..a7c29297c 100644
--- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefPackage.java
+++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/EefPackage.java
@@ -1749,130 +1749,6 @@ public interface EefPackage extends EPackage {
 	int EEF_CUSTOM_EXPRESSION_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.eef.impl.EEFReferenceDescriptionImpl
-	 * <em>EEF Reference Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.eef.impl.EEFReferenceDescriptionImpl
-	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFReferenceDescription()
-	 * @generated
-	 */
-	int EEF_REFERENCE_DESCRIPTION = 25;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_DESCRIPTION__IDENTIFIER = EefPackage.EEF_WIDGET_DESCRIPTION__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_DESCRIPTION__LABEL_EXPRESSION = EefPackage.EEF_WIDGET_DESCRIPTION__LABEL_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Help Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_DESCRIPTION__HELP_EXPRESSION = EefPackage.EEF_WIDGET_DESCRIPTION__HELP_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Is Enabled Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_DESCRIPTION__IS_ENABLED_EXPRESSION = EefPackage.EEF_WIDGET_DESCRIPTION__IS_ENABLED_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Property Validation Rules</b></em>' reference list. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_DESCRIPTION__PROPERTY_VALIDATION_RULES = EefPackage.EEF_WIDGET_DESCRIPTION__PROPERTY_VALIDATION_RULES;
-
-	/**
-	 * The feature id for the '<em><b>Multiple</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_DESCRIPTION__MULTIPLE = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Value Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_DESCRIPTION__VALUE_EXPRESSION = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Display Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>On Click Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_DESCRIPTION__ON_CLICK_EXPRESSION = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Actions</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_DESCRIPTION__ACTIONS = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Style</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_DESCRIPTION__STYLE = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Conditional Styles</b></em>' containment reference list. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_DESCRIPTION__CONDITIONAL_STYLES = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>EEF Reference Description</em>' class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_DESCRIPTION_FEATURE_COUNT = EefPackage.EEF_WIDGET_DESCRIPTION_FEATURE_COUNT + 7;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.eef.impl.EEFListDescriptionImpl <em>EEF List Description</em>}'
 	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -1880,7 +1756,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFListDescription()
 	 * @generated
 	 */
-	int EEF_LIST_DESCRIPTION = 26;
+	int EEF_LIST_DESCRIPTION = 25;
 
 	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1996,7 +1872,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFWidgetStyle()
 	 * @generated
 	 */
-	int EEF_WIDGET_STYLE = 27;
+	int EEF_WIDGET_STYLE = 26;
 
 	/**
 	 * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc -->
@@ -2060,7 +1936,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFTextStyle()
 	 * @generated
 	 */
-	int EEF_TEXT_STYLE = 28;
+	int EEF_TEXT_STYLE = 27;
 
 	/**
 	 * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc -->
@@ -2169,7 +2045,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFLabelStyle()
 	 * @generated
 	 */
-	int EEF_LABEL_STYLE = 29;
+	int EEF_LABEL_STYLE = 28;
 
 	/**
 	 * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc -->
@@ -2278,7 +2154,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFButtonStyle()
 	 * @generated
 	 */
-	int EEF_BUTTON_STYLE = 30;
+	int EEF_BUTTON_STYLE = 29;
 
 	/**
 	 * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc -->
@@ -2342,7 +2218,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFCheckboxStyle()
 	 * @generated
 	 */
-	int EEF_CHECKBOX_STYLE = 31;
+	int EEF_CHECKBOX_STYLE = 30;
 
 	/**
 	 * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc -->
@@ -2406,7 +2282,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFSelectStyle()
 	 * @generated
 	 */
-	int EEF_SELECT_STYLE = 32;
+	int EEF_SELECT_STYLE = 31;
 
 	/**
 	 * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc -->
@@ -2470,7 +2346,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFRadioStyle()
 	 * @generated
 	 */
-	int EEF_RADIO_STYLE = 33;
+	int EEF_RADIO_STYLE = 32;
 
 	/**
 	 * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc -->
@@ -2534,7 +2410,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFHyperlinkStyle()
 	 * @generated
 	 */
-	int EEF_HYPERLINK_STYLE = 34;
+	int EEF_HYPERLINK_STYLE = 33;
 
 	/**
 	 * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc -->
@@ -2634,7 +2510,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFCustomWidgetStyle()
 	 * @generated
 	 */
-	int EEF_CUSTOM_WIDGET_STYLE = 35;
+	int EEF_CUSTOM_WIDGET_STYLE = 34;
 
 	/**
 	 * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc -->
@@ -2691,70 +2567,6 @@ public interface EefPackage extends EPackage {
 	int EEF_CUSTOM_WIDGET_STYLE_FEATURE_COUNT = EefPackage.EEF_WIDGET_STYLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.eef.impl.EEFReferenceStyleImpl <em>EEF Reference Style</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.eef.impl.EEFReferenceStyleImpl
-	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFReferenceStyle()
-	 * @generated
-	 */
-	int EEF_REFERENCE_STYLE = 36;
-
-	/**
-	 * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_STYLE__LABEL_BACKGROUND_COLOR_EXPRESSION = EefPackage.EEF_WIDGET_STYLE__LABEL_BACKGROUND_COLOR_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Label Foreground Color Expression</b></em>' attribute. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_STYLE__LABEL_FOREGROUND_COLOR_EXPRESSION = EefPackage.EEF_WIDGET_STYLE__LABEL_FOREGROUND_COLOR_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Label Font Name Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_STYLE__LABEL_FONT_NAME_EXPRESSION = EefPackage.EEF_WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Label Font Size Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_STYLE__LABEL_FONT_SIZE_EXPRESSION = EefPackage.EEF_WIDGET_STYLE__LABEL_FONT_SIZE_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Label Font Style Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_STYLE__LABEL_FONT_STYLE_EXPRESSION = EefPackage.EEF_WIDGET_STYLE__LABEL_FONT_STYLE_EXPRESSION;
-
-	/**
-	 * The number of structural features of the '<em>EEF Reference Style</em>' class. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_STYLE_FEATURE_COUNT = EefPackage.EEF_WIDGET_STYLE_FEATURE_COUNT + 0;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.eef.impl.EEFListStyleImpl <em>EEF List Style</em>}' class. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -2762,7 +2574,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFListStyle()
 	 * @generated
 	 */
-	int EEF_LIST_STYLE = 37;
+	int EEF_LIST_STYLE = 35;
 
 	/**
 	 * The feature id for the '<em><b>Label Background Color Expression</b></em>' attribute. <!-- begin-user-doc -->
@@ -2826,7 +2638,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFGroupStyle()
 	 * @generated
 	 */
-	int EEF_GROUP_STYLE = 38;
+	int EEF_GROUP_STYLE = 36;
 
 	/**
 	 * The feature id for the '<em><b>Background Color Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -2906,7 +2718,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFConditionalStyle()
 	 * @generated
 	 */
-	int EEF_CONDITIONAL_STYLE = 39;
+	int EEF_CONDITIONAL_STYLE = 37;
 
 	/**
 	 * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -2934,7 +2746,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFTextConditionalStyle()
 	 * @generated
 	 */
-	int EEF_TEXT_CONDITIONAL_STYLE = 40;
+	int EEF_TEXT_CONDITIONAL_STYLE = 38;
 
 	/**
 	 * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -2971,7 +2783,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFButtonConditionalStyle()
 	 * @generated
 	 */
-	int EEF_BUTTON_CONDITIONAL_STYLE = 41;
+	int EEF_BUTTON_CONDITIONAL_STYLE = 39;
 
 	/**
 	 * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -3008,7 +2820,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFLabelConditionalStyle()
 	 * @generated
 	 */
-	int EEF_LABEL_CONDITIONAL_STYLE = 42;
+	int EEF_LABEL_CONDITIONAL_STYLE = 40;
 
 	/**
 	 * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -3045,7 +2857,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFCheckboxConditionalStyle()
 	 * @generated
 	 */
-	int EEF_CHECKBOX_CONDITIONAL_STYLE = 43;
+	int EEF_CHECKBOX_CONDITIONAL_STYLE = 41;
 
 	/**
 	 * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -3082,7 +2894,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFSelectConditionalStyle()
 	 * @generated
 	 */
-	int EEF_SELECT_CONDITIONAL_STYLE = 44;
+	int EEF_SELECT_CONDITIONAL_STYLE = 42;
 
 	/**
 	 * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -3119,7 +2931,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFRadioConditionalStyle()
 	 * @generated
 	 */
-	int EEF_RADIO_CONDITIONAL_STYLE = 45;
+	int EEF_RADIO_CONDITIONAL_STYLE = 43;
 
 	/**
 	 * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -3156,7 +2968,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFHyperlinkConditionalStyle()
 	 * @generated
 	 */
-	int EEF_HYPERLINK_CONDITIONAL_STYLE = 46;
+	int EEF_HYPERLINK_CONDITIONAL_STYLE = 44;
 
 	/**
 	 * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -3193,7 +3005,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFCustomWidgetConditionalStyle()
 	 * @generated
 	 */
-	int EEF_CUSTOM_WIDGET_CONDITIONAL_STYLE = 47;
+	int EEF_CUSTOM_WIDGET_CONDITIONAL_STYLE = 45;
 
 	/**
 	 * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -3230,7 +3042,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFWidgetAction()
 	 * @generated
 	 */
-	int EEF_WIDGET_ACTION = 48;
+	int EEF_WIDGET_ACTION = 46;
 
 	/**
 	 * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -3260,43 +3072,6 @@ public interface EefPackage extends EPackage {
 	int EEF_WIDGET_ACTION_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.eef.impl.EEFReferenceConditionalStyleImpl
-	 * <em>EEF Reference Conditional Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.eef.impl.EEFReferenceConditionalStyleImpl
-	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFReferenceConditionalStyle()
-	 * @generated
-	 */
-	int EEF_REFERENCE_CONDITIONAL_STYLE = 49;
-
-	/**
-	 * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION = EefPackage.EEF_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Style</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_CONDITIONAL_STYLE__STYLE = EefPackage.EEF_CONDITIONAL_STYLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>EEF Reference Conditional Style</em>' class. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EEF_REFERENCE_CONDITIONAL_STYLE_FEATURE_COUNT = EefPackage.EEF_CONDITIONAL_STYLE_FEATURE_COUNT + 1;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.eef.impl.EEFListConditionalStyleImpl
 	 * <em>EEF List Conditional Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -3304,7 +3079,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFListConditionalStyle()
 	 * @generated
 	 */
-	int EEF_LIST_CONDITIONAL_STYLE = 50;
+	int EEF_LIST_CONDITIONAL_STYLE = 47;
 
 	/**
 	 * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -3341,7 +3116,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFGroupConditionalStyle()
 	 * @generated
 	 */
-	int EEF_GROUP_CONDITIONAL_STYLE = 51;
+	int EEF_GROUP_CONDITIONAL_STYLE = 48;
 
 	/**
 	 * The feature id for the '<em><b>Precondition Expression</b></em>' attribute. <!-- begin-user-doc --> <!--
@@ -3378,7 +3153,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEF_VALIDATION_SEVERITY_DESCRIPTION()
 	 * @generated
 	 */
-	int EEF_VALIDATION_SEVERITY_DESCRIPTION = 52;
+	int EEF_VALIDATION_SEVERITY_DESCRIPTION = 49;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.eef.EEF_FILL_LAYOUT_ORIENTATION
@@ -3388,7 +3163,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEF_FILL_LAYOUT_ORIENTATION()
 	 * @generated
 	 */
-	int EEF_FILL_LAYOUT_ORIENTATION = 53;
+	int EEF_FILL_LAYOUT_ORIENTATION = 50;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.eef.EEF_TOGGLE_STYLE <em>EEF TOGGLE STYLE</em>}' enum. <!--
@@ -3398,7 +3173,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEF_TOGGLE_STYLE()
 	 * @generated
 	 */
-	int EEF_TOGGLE_STYLE = 54;
+	int EEF_TOGGLE_STYLE = 51;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.eef.EEF_TITLE_BAR_STYLE <em>EEF TITLE BAR STYLE</em>}' enum. <!--
@@ -3408,7 +3183,7 @@ public interface EefPackage extends EPackage {
 	 * @see org.eclipse.eef.impl.EefPackageImpl#getEEF_TITLE_BAR_STYLE()
 	 * @generated
 	 */
-	int EEF_TITLE_BAR_STYLE = 55;
+	int EEF_TITLE_BAR_STYLE = 52;
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.eef.EEFViewDescription <em>EEF View Description</em>}'.
@@ -4669,95 +4444,6 @@ public interface EefPackage extends EPackage {
 	EAttribute getEEFCustomExpression_CustomExpression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.eef.EEFReferenceDescription
-	 * <em>EEF Reference Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>EEF Reference Description</em>'.
-	 * @see org.eclipse.eef.EEFReferenceDescription
-	 * @generated
-	 */
-	EClass getEEFReferenceDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.eef.EEFReferenceDescription#isMultiple
-	 * <em>Multiple</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Multiple</em>'.
-	 * @see org.eclipse.eef.EEFReferenceDescription#isMultiple()
-	 * @see #getEEFReferenceDescription()
-	 * @generated
-	 */
-	EAttribute getEEFReferenceDescription_Multiple();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.eef.EEFReferenceDescription#getValueExpression
-	 * <em>Value Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Value Expression</em>'.
-	 * @see org.eclipse.eef.EEFReferenceDescription#getValueExpression()
-	 * @see #getEEFReferenceDescription()
-	 * @generated
-	 */
-	EAttribute getEEFReferenceDescription_ValueExpression();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.eef.EEFReferenceDescription#getDisplayExpression
-	 * <em>Display Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Display Expression</em>'.
-	 * @see org.eclipse.eef.EEFReferenceDescription#getDisplayExpression()
-	 * @see #getEEFReferenceDescription()
-	 * @generated
-	 */
-	EAttribute getEEFReferenceDescription_DisplayExpression();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.eef.EEFReferenceDescription#getOnClickExpression
-	 * <em>On Click Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>On Click Expression</em>'.
-	 * @see org.eclipse.eef.EEFReferenceDescription#getOnClickExpression()
-	 * @see #getEEFReferenceDescription()
-	 * @generated
-	 */
-	EAttribute getEEFReferenceDescription_OnClickExpression();
-
-	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.eef.EEFReferenceDescription#getActions <em>Actions</em>}'. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference list '<em>Actions</em>'.
-	 * @see org.eclipse.eef.EEFReferenceDescription#getActions()
-	 * @see #getEEFReferenceDescription()
-	 * @generated
-	 */
-	EReference getEEFReferenceDescription_Actions();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.eef.EEFReferenceDescription#getStyle
-	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference '<em>Style</em>'.
-	 * @see org.eclipse.eef.EEFReferenceDescription#getStyle()
-	 * @see #getEEFReferenceDescription()
-	 * @generated
-	 */
-	EReference getEEFReferenceDescription_Style();
-
-	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.eef.EEFReferenceDescription#getConditionalStyles <em>Conditional Styles</em>}'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference list '<em>Conditional Styles</em>'.
-	 * @see org.eclipse.eef.EEFReferenceDescription#getConditionalStyles()
-	 * @see #getEEFReferenceDescription()
-	 * @generated
-	 */
-	EReference getEEFReferenceDescription_ConditionalStyles();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.eef.EEFListDescription <em>EEF List Description</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -5136,16 +4822,6 @@ public interface EefPackage extends EPackage {
 	EClass getEEFCustomWidgetStyle();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.eef.EEFReferenceStyle <em>EEF Reference Style</em>}'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>EEF Reference Style</em>'.
-	 * @see org.eclipse.eef.EEFReferenceStyle
-	 * @generated
-	 */
-	EClass getEEFReferenceStyle();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.eef.EEFListStyle <em>EEF List Style</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -5467,28 +5143,6 @@ public interface EefPackage extends EPackage {
 	EAttribute getEEFWidgetAction_ActionExpression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.eef.EEFReferenceConditionalStyle
-	 * <em>EEF Reference Conditional Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>EEF Reference Conditional Style</em>'.
-	 * @see org.eclipse.eef.EEFReferenceConditionalStyle
-	 * @generated
-	 */
-	EClass getEEFReferenceConditionalStyle();
-
-	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.eef.EEFReferenceConditionalStyle#getStyle <em>Style</em>}'. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference '<em>Style</em>'.
-	 * @see org.eclipse.eef.EEFReferenceConditionalStyle#getStyle()
-	 * @see #getEEFReferenceConditionalStyle()
-	 * @generated
-	 */
-	EReference getEEFReferenceConditionalStyle_Style();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.eef.EEFListConditionalStyle
 	 * <em>EEF List Conditional Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
@@ -6556,72 +6210,6 @@ public interface EefPackage extends EPackage {
 		EAttribute EEF_CUSTOM_EXPRESSION__CUSTOM_EXPRESSION = EefPackage.eINSTANCE.getEEFCustomExpression_CustomExpression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.eef.impl.EEFReferenceDescriptionImpl
-		 * <em>EEF Reference Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.eef.impl.EEFReferenceDescriptionImpl
-		 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFReferenceDescription()
-		 * @generated
-		 */
-		EClass EEF_REFERENCE_DESCRIPTION = EefPackage.eINSTANCE.getEEFReferenceDescription();
-
-		/**
-		 * The meta object literal for the '<em><b>Multiple</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute EEF_REFERENCE_DESCRIPTION__MULTIPLE = EefPackage.eINSTANCE.getEEFReferenceDescription_Multiple();
-
-		/**
-		 * The meta object literal for the '<em><b>Value Expression</b></em>' attribute feature. <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute EEF_REFERENCE_DESCRIPTION__VALUE_EXPRESSION = EefPackage.eINSTANCE.getEEFReferenceDescription_ValueExpression();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Expression</b></em>' attribute feature. <!-- begin-user-doc
-		 * --> <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute EEF_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION = EefPackage.eINSTANCE.getEEFReferenceDescription_DisplayExpression();
-
-		/**
-		 * The meta object literal for the '<em><b>On Click Expression</b></em>' attribute feature. <!-- begin-user-doc
-		 * --> <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute EEF_REFERENCE_DESCRIPTION__ON_CLICK_EXPRESSION = EefPackage.eINSTANCE.getEEFReferenceDescription_OnClickExpression();
-
-		/**
-		 * The meta object literal for the '<em><b>Actions</b></em>' containment reference list feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference EEF_REFERENCE_DESCRIPTION__ACTIONS = EefPackage.eINSTANCE.getEEFReferenceDescription_Actions();
-
-		/**
-		 * The meta object literal for the '<em><b>Style</b></em>' containment reference feature. <!-- begin-user-doc
-		 * --> <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference EEF_REFERENCE_DESCRIPTION__STYLE = EefPackage.eINSTANCE.getEEFReferenceDescription_Style();
-
-		/**
-		 * The meta object literal for the '<em><b>Conditional Styles</b></em>' containment reference list feature. <!--
-		 * begin-user-doc --> <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference EEF_REFERENCE_DESCRIPTION__CONDITIONAL_STYLES = EefPackage.eINSTANCE.getEEFReferenceDescription_ConditionalStyles();
-
-		/**
 		 * The meta object literal for the '{@link org.eclipse.eef.impl.EEFListDescriptionImpl
 		 * <em>EEF List Description</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
 		 *
@@ -6922,16 +6510,6 @@ public interface EefPackage extends EPackage {
 		EClass EEF_CUSTOM_WIDGET_STYLE = EefPackage.eINSTANCE.getEEFCustomWidgetStyle();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.eef.impl.EEFReferenceStyleImpl
-		 * <em>EEF Reference Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.eef.impl.EEFReferenceStyleImpl
-		 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFReferenceStyle()
-		 * @generated
-		 */
-		EClass EEF_REFERENCE_STYLE = EefPackage.eINSTANCE.getEEFReferenceStyle();
-
-		/**
 		 * The meta object literal for the '{@link org.eclipse.eef.impl.EEFListStyleImpl <em>EEF List Style</em>}'
 		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
 		 *
@@ -7196,24 +6774,6 @@ public interface EefPackage extends EPackage {
 		EAttribute EEF_WIDGET_ACTION__ACTION_EXPRESSION = EefPackage.eINSTANCE.getEEFWidgetAction_ActionExpression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.eef.impl.EEFReferenceConditionalStyleImpl
-		 * <em>EEF Reference Conditional Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.eef.impl.EEFReferenceConditionalStyleImpl
-		 * @see org.eclipse.eef.impl.EefPackageImpl#getEEFReferenceConditionalStyle()
-		 * @generated
-		 */
-		EClass EEF_REFERENCE_CONDITIONAL_STYLE = EefPackage.eINSTANCE.getEEFReferenceConditionalStyle();
-
-		/**
-		 * The meta object literal for the '<em><b>Style</b></em>' containment reference feature. <!-- begin-user-doc
-		 * --> <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference EEF_REFERENCE_CONDITIONAL_STYLE__STYLE = EefPackage.eINSTANCE.getEEFReferenceConditionalStyle_Style();
-
-		/**
 		 * The meta object literal for the '{@link org.eclipse.eef.impl.EEFListConditionalStyleImpl
 		 * <em>EEF List Conditional Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
 		 *
diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFReferenceConditionalStyleImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFReferenceConditionalStyleImpl.java
deleted file mode 100644
index 3512eb4ff..000000000
--- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFReferenceConditionalStyleImpl.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- * Copyright (c) 2015 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.htm
- * Contributors: Obeo - initial API and implementation
- */
-package org.eclipse.eef.impl;
-
-import org.eclipse.eef.EEFReferenceConditionalStyle;
-import org.eclipse.eef.EEFReferenceStyle;
-import org.eclipse.eef.EefPackage;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>EEF Reference Conditional Style</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.eef.impl.EEFReferenceConditionalStyleImpl#getStyle <em>Style</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EEFReferenceConditionalStyleImpl extends EEFConditionalStyleImpl implements EEFReferenceConditionalStyle {
-	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' containment reference. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @see #getStyle()
-	 * @generated
-	 * @ordered
-	 */
-	protected EEFReferenceStyle style;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected EEFReferenceConditionalStyleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return EefPackage.Literals.EEF_REFERENCE_CONDITIONAL_STYLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EEFReferenceStyle getStyle() {
-		if (style != null && style.eIsProxy()) {
-			InternalEObject oldStyle = (InternalEObject) style;
-			style = (EEFReferenceStyle) eResolveProxy(oldStyle);
-			if (style != oldStyle) {
-				InternalEObject newStyle = (InternalEObject) style;
-				NotificationChain msgs = oldStyle.eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE
-						- EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE, null, null);
-				if (newStyle.eInternalContainer() == null) {
-					msgs = newStyle.eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE,
-							null, msgs);
-				}
-				if (msgs != null) {
-					msgs.dispatch();
-				}
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE, oldStyle, style));
-				}
-			}
-		}
-		return style;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EEFReferenceStyle basicGetStyle() {
-		return style;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public NotificationChain basicSetStyle(EEFReferenceStyle newStyle, NotificationChain msgs) {
-		EEFReferenceStyle oldStyle = style;
-		style = newStyle;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE,
-					oldStyle, newStyle);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setStyle(EEFReferenceStyle newStyle) {
-		if (newStyle != style) {
-			NotificationChain msgs = null;
-			if (style != null) {
-				msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE
-						- EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE, null, msgs);
-			}
-			if (newStyle != null) {
-				msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE
-						- EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE, null, msgs);
-			}
-			msgs = basicSetStyle(newStyle, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
-		} else if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE, newStyle, newStyle));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE:
-			return basicSetStyle(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE:
-			if (resolve) {
-				return getStyle();
-			}
-			return basicGetStyle();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE:
-			setStyle((EEFReferenceStyle) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE:
-			setStyle((EEFReferenceStyle) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE:
-			return style != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} // EEFReferenceConditionalStyleImpl
diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFReferenceDescriptionImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFReferenceDescriptionImpl.java
deleted file mode 100644
index f0928c49d..000000000
--- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFReferenceDescriptionImpl.java
+++ /dev/null
@@ -1,555 +0,0 @@
-/**
- * Copyright (c) 2015 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.htm
- * Contributors: Obeo - initial API and implementation
- */
-package org.eclipse.eef.impl;
-
-import java.util.Collection;
-
-import org.eclipse.eef.EEFReferenceConditionalStyle;
-import org.eclipse.eef.EEFReferenceDescription;
-import org.eclipse.eef.EEFReferenceStyle;
-import org.eclipse.eef.EEFWidgetAction;
-import org.eclipse.eef.EefPackage;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>EEF Reference Description</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.eef.impl.EEFReferenceDescriptionImpl#isMultiple <em>Multiple</em>}</li>
- * <li>{@link org.eclipse.eef.impl.EEFReferenceDescriptionImpl#getValueExpression <em>Value Expression</em>}</li>
- * <li>{@link org.eclipse.eef.impl.EEFReferenceDescriptionImpl#getDisplayExpression <em>Display Expression</em>}</li>
- * <li>{@link org.eclipse.eef.impl.EEFReferenceDescriptionImpl#getOnClickExpression <em>On Click Expression</em>}</li>
- * <li>{@link org.eclipse.eef.impl.EEFReferenceDescriptionImpl#getActions <em>Actions</em>}</li>
- * <li>{@link org.eclipse.eef.impl.EEFReferenceDescriptionImpl#getStyle <em>Style</em>}</li>
- * <li>{@link org.eclipse.eef.impl.EEFReferenceDescriptionImpl#getConditionalStyles <em>Conditional Styles</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EEFReferenceDescriptionImpl extends EEFWidgetDescriptionImpl implements EEFReferenceDescription {
-	/**
-	 * The default value of the '{@link #isMultiple() <em>Multiple</em>}' attribute. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @see #isMultiple()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MULTIPLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMultiple() <em>Multiple</em>}' attribute. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @see #isMultiple()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean multiple = EEFReferenceDescriptionImpl.MULTIPLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValueExpression() <em>Value Expression</em>}' attribute. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 *
-	 * @see #getValueExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EXPRESSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValueExpression() <em>Value Expression</em>}' attribute. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 *
-	 * @see #getValueExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected String valueExpression = EEFReferenceDescriptionImpl.VALUE_EXPRESSION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDisplayExpression() <em>Display Expression</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see #getDisplayExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_EXPRESSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayExpression() <em>Display Expression</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see #getDisplayExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayExpression = EEFReferenceDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getOnClickExpression() <em>On Click Expression</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see #getOnClickExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ON_CLICK_EXPRESSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOnClickExpression() <em>On Click Expression</em>}' attribute. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see #getOnClickExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected String onClickExpression = EEFReferenceDescriptionImpl.ON_CLICK_EXPRESSION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getActions() <em>Actions</em>}' containment reference list. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 *
-	 * @see #getActions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<EEFWidgetAction> actions;
-
-	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' containment reference. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @see #getStyle()
-	 * @generated
-	 * @ordered
-	 */
-	protected EEFReferenceStyle style;
-
-	/**
-	 * The cached value of the '{@link #getConditionalStyles() <em>Conditional Styles</em>}' containment reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see #getConditionalStyles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<EEFReferenceConditionalStyle> conditionalStyles;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected EEFReferenceDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return EefPackage.Literals.EEF_REFERENCE_DESCRIPTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean isMultiple() {
-		return multiple;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setMultiple(boolean newMultiple) {
-		boolean oldMultiple = multiple;
-		multiple = newMultiple;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_REFERENCE_DESCRIPTION__MULTIPLE, oldMultiple, multiple));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getValueExpression() {
-		return valueExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setValueExpression(String newValueExpression) {
-		String oldValueExpression = valueExpression;
-		valueExpression = newValueExpression;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_REFERENCE_DESCRIPTION__VALUE_EXPRESSION, oldValueExpression,
-					valueExpression));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getDisplayExpression() {
-		return displayExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setDisplayExpression(String newDisplayExpression) {
-		String oldDisplayExpression = displayExpression;
-		displayExpression = newDisplayExpression;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION, oldDisplayExpression,
-					displayExpression));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getOnClickExpression() {
-		return onClickExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setOnClickExpression(String newOnClickExpression) {
-		String oldOnClickExpression = onClickExpression;
-		onClickExpression = newOnClickExpression;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_REFERENCE_DESCRIPTION__ON_CLICK_EXPRESSION, oldOnClickExpression,
-					onClickExpression));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EList<EEFWidgetAction> getActions() {
-		if (actions == null) {
-			actions = new EObjectContainmentEList.Resolving<EEFWidgetAction>(EEFWidgetAction.class, this,
-					EefPackage.EEF_REFERENCE_DESCRIPTION__ACTIONS);
-		}
-		return actions;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EEFReferenceStyle getStyle() {
-		if (style != null && style.eIsProxy()) {
-			InternalEObject oldStyle = (InternalEObject) style;
-			style = (EEFReferenceStyle) eResolveProxy(oldStyle);
-			if (style != oldStyle) {
-				InternalEObject newStyle = (InternalEObject) style;
-				NotificationChain msgs = oldStyle.eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE
-						- EefPackage.EEF_REFERENCE_DESCRIPTION__STYLE, null, null);
-				if (newStyle.eInternalContainer() == null) {
-					msgs = newStyle.eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - EefPackage.EEF_REFERENCE_DESCRIPTION__STYLE, null,
-							msgs);
-				}
-				if (msgs != null) {
-					msgs.dispatch();
-				}
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EefPackage.EEF_REFERENCE_DESCRIPTION__STYLE, oldStyle, style));
-				}
-			}
-		}
-		return style;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EEFReferenceStyle basicGetStyle() {
-		return style;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public NotificationChain basicSetStyle(EEFReferenceStyle newStyle, NotificationChain msgs) {
-		EEFReferenceStyle oldStyle = style;
-		style = newStyle;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EefPackage.EEF_REFERENCE_DESCRIPTION__STYLE, oldStyle,
-					newStyle);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setStyle(EEFReferenceStyle newStyle) {
-		if (newStyle != style) {
-			NotificationChain msgs = null;
-			if (style != null) {
-				msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE
-						- EefPackage.EEF_REFERENCE_DESCRIPTION__STYLE, null, msgs);
-			}
-			if (newStyle != null) {
-				msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE
-						- EefPackage.EEF_REFERENCE_DESCRIPTION__STYLE, null, msgs);
-			}
-			msgs = basicSetStyle(newStyle, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
-		} else if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, EefPackage.EEF_REFERENCE_DESCRIPTION__STYLE, newStyle, newStyle));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EList<EEFReferenceConditionalStyle> getConditionalStyles() {
-		if (conditionalStyles == null) {
-			conditionalStyles = new EObjectContainmentEList.Resolving<EEFReferenceConditionalStyle>(EEFReferenceConditionalStyle.class, this,
-					EefPackage.EEF_REFERENCE_DESCRIPTION__CONDITIONAL_STYLES);
-		}
-		return conditionalStyles;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__ACTIONS:
-			return ((InternalEList<?>) getActions()).basicRemove(otherEnd, msgs);
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__STYLE:
-			return basicSetStyle(null, msgs);
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__CONDITIONAL_STYLES:
-			return ((InternalEList<?>) getConditionalStyles()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__MULTIPLE:
-			return isMultiple();
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__VALUE_EXPRESSION:
-			return getValueExpression();
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION:
-			return getDisplayExpression();
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__ON_CLICK_EXPRESSION:
-			return getOnClickExpression();
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__ACTIONS:
-			return getActions();
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__STYLE:
-			if (resolve) {
-				return getStyle();
-			}
-			return basicGetStyle();
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__CONDITIONAL_STYLES:
-			return getConditionalStyles();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__MULTIPLE:
-			setMultiple((Boolean) newValue);
-			return;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__VALUE_EXPRESSION:
-			setValueExpression((String) newValue);
-			return;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION:
-			setDisplayExpression((String) newValue);
-			return;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__ON_CLICK_EXPRESSION:
-			setOnClickExpression((String) newValue);
-			return;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__ACTIONS:
-			getActions().clear();
-			getActions().addAll((Collection<? extends EEFWidgetAction>) newValue);
-			return;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__STYLE:
-			setStyle((EEFReferenceStyle) newValue);
-			return;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__CONDITIONAL_STYLES:
-			getConditionalStyles().clear();
-			getConditionalStyles().addAll((Collection<? extends EEFReferenceConditionalStyle>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__MULTIPLE:
-			setMultiple(EEFReferenceDescriptionImpl.MULTIPLE_EDEFAULT);
-			return;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__VALUE_EXPRESSION:
-			setValueExpression(EEFReferenceDescriptionImpl.VALUE_EXPRESSION_EDEFAULT);
-			return;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION:
-			setDisplayExpression(EEFReferenceDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT);
-			return;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__ON_CLICK_EXPRESSION:
-			setOnClickExpression(EEFReferenceDescriptionImpl.ON_CLICK_EXPRESSION_EDEFAULT);
-			return;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__ACTIONS:
-			getActions().clear();
-			return;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__STYLE:
-			setStyle((EEFReferenceStyle) null);
-			return;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__CONDITIONAL_STYLES:
-			getConditionalStyles().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__MULTIPLE:
-			return multiple != EEFReferenceDescriptionImpl.MULTIPLE_EDEFAULT;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__VALUE_EXPRESSION:
-			return EEFReferenceDescriptionImpl.VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null
-			: !EEFReferenceDescriptionImpl.VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION:
-			return EEFReferenceDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT == null ? displayExpression != null
-			: !EEFReferenceDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT.equals(displayExpression);
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__ON_CLICK_EXPRESSION:
-			return EEFReferenceDescriptionImpl.ON_CLICK_EXPRESSION_EDEFAULT == null ? onClickExpression != null
-			: !EEFReferenceDescriptionImpl.ON_CLICK_EXPRESSION_EDEFAULT.equals(onClickExpression);
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__ACTIONS:
-			return actions != null && !actions.isEmpty();
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__STYLE:
-			return style != null;
-		case EefPackage.EEF_REFERENCE_DESCRIPTION__CONDITIONAL_STYLES:
-			return conditionalStyles != null && !conditionalStyles.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (multiple: "); //$NON-NLS-1$
-		result.append(multiple);
-		result.append(", valueExpression: "); //$NON-NLS-1$
-		result.append(valueExpression);
-		result.append(", displayExpression: "); //$NON-NLS-1$
-		result.append(displayExpression);
-		result.append(", onClickExpression: "); //$NON-NLS-1$
-		result.append(onClickExpression);
-		result.append(')');
-		return result.toString();
-	}
-
-} // EEFReferenceDescriptionImpl
diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFReferenceStyleImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFReferenceStyleImpl.java
deleted file mode 100644
index c6886edcf..000000000
--- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EEFReferenceStyleImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright (c) 2015 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.htm
- * Contributors: Obeo - initial API and implementation
- */
-package org.eclipse.eef.impl;
-
-import org.eclipse.eef.EEFReferenceStyle;
-import org.eclipse.eef.EefPackage;
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>EEF Reference Style</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class EEFReferenceStyleImpl extends EEFWidgetStyleImpl implements EEFReferenceStyle {
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected EEFReferenceStyleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return EefPackage.Literals.EEF_REFERENCE_STYLE;
-	}
-
-} // EEFReferenceStyleImpl
diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefFactoryImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefFactoryImpl.java
index cb88dd8bb..d48edc45f 100644
--- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefFactoryImpl.java
+++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefFactoryImpl.java
@@ -40,9 +40,6 @@ import org.eclipse.eef.EEFPropertyValidationRuleDescription;
 import org.eclipse.eef.EEFRadioConditionalStyle;
 import org.eclipse.eef.EEFRadioDescription;
 import org.eclipse.eef.EEFRadioStyle;
-import org.eclipse.eef.EEFReferenceConditionalStyle;
-import org.eclipse.eef.EEFReferenceDescription;
-import org.eclipse.eef.EEFReferenceStyle;
 import org.eclipse.eef.EEFRuleAuditDescription;
 import org.eclipse.eef.EEFSelectConditionalStyle;
 import org.eclipse.eef.EEFSelectDescription;
@@ -149,8 +146,6 @@ public class EefFactoryImpl extends EFactoryImpl implements EefFactory {
 			return createEEFCustomWidgetDescription();
 		case EefPackage.EEF_CUSTOM_EXPRESSION:
 			return createEEFCustomExpression();
-		case EefPackage.EEF_REFERENCE_DESCRIPTION:
-			return createEEFReferenceDescription();
 		case EefPackage.EEF_LIST_DESCRIPTION:
 			return createEEFListDescription();
 		case EefPackage.EEF_TEXT_STYLE:
@@ -169,8 +164,6 @@ public class EefFactoryImpl extends EFactoryImpl implements EefFactory {
 			return createEEFHyperlinkStyle();
 		case EefPackage.EEF_CUSTOM_WIDGET_STYLE:
 			return createEEFCustomWidgetStyle();
-		case EefPackage.EEF_REFERENCE_STYLE:
-			return createEEFReferenceStyle();
 		case EefPackage.EEF_LIST_STYLE:
 			return createEEFListStyle();
 		case EefPackage.EEF_GROUP_STYLE:
@@ -193,8 +186,6 @@ public class EefFactoryImpl extends EFactoryImpl implements EefFactory {
 			return createEEFCustomWidgetConditionalStyle();
 		case EefPackage.EEF_WIDGET_ACTION:
 			return createEEFWidgetAction();
-		case EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE:
-			return createEEFReferenceConditionalStyle();
 		case EefPackage.EEF_LIST_CONDITIONAL_STYLE:
 			return createEEFListConditionalStyle();
 		case EefPackage.EEF_GROUP_CONDITIONAL_STYLE:
@@ -483,17 +474,6 @@ public class EefFactoryImpl extends EFactoryImpl implements EefFactory {
 	 * @generated
 	 */
 	@Override
-	public EEFReferenceDescription createEEFReferenceDescription() {
-		EEFReferenceDescriptionImpl eefReferenceDescription = new EEFReferenceDescriptionImpl();
-		return eefReferenceDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
 	public EEFListDescription createEEFListDescription() {
 		EEFListDescriptionImpl eefListDescription = new EEFListDescriptionImpl();
 		return eefListDescription;
@@ -593,17 +573,6 @@ public class EefFactoryImpl extends EFactoryImpl implements EefFactory {
 	 * @generated
 	 */
 	@Override
-	public EEFReferenceStyle createEEFReferenceStyle() {
-		EEFReferenceStyleImpl eefReferenceStyle = new EEFReferenceStyleImpl();
-		return eefReferenceStyle;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
 	public EEFListStyle createEEFListStyle() {
 		EEFListStyleImpl eefListStyle = new EEFListStyleImpl();
 		return eefListStyle;
@@ -725,17 +694,6 @@ public class EefFactoryImpl extends EFactoryImpl implements EefFactory {
 	 * @generated
 	 */
 	@Override
-	public EEFReferenceConditionalStyle createEEFReferenceConditionalStyle() {
-		EEFReferenceConditionalStyleImpl eefReferenceConditionalStyle = new EEFReferenceConditionalStyleImpl();
-		return eefReferenceConditionalStyle;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
 	public EEFListConditionalStyle createEEFListConditionalStyle() {
 		EEFListConditionalStyleImpl eefListConditionalStyle = new EEFListConditionalStyleImpl();
 		return eefListConditionalStyle;
diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefPackageImpl.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefPackageImpl.java
index 4a4a1d68f..5289a4ae2 100644
--- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefPackageImpl.java
+++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/impl/EefPackageImpl.java
@@ -43,9 +43,6 @@ import org.eclipse.eef.EEFPropertyValidationRuleDescription;
 import org.eclipse.eef.EEFRadioConditionalStyle;
 import org.eclipse.eef.EEFRadioDescription;
 import org.eclipse.eef.EEFRadioStyle;
-import org.eclipse.eef.EEFReferenceConditionalStyle;
-import org.eclipse.eef.EEFReferenceDescription;
-import org.eclipse.eef.EEFReferenceStyle;
 import org.eclipse.eef.EEFRuleAuditDescription;
 import org.eclipse.eef.EEFSelectConditionalStyle;
 import org.eclipse.eef.EEFSelectDescription;
@@ -256,13 +253,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 	 *
 	 * @generated
 	 */
-	private EClass eefReferenceDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
 	private EClass eefListDescriptionEClass = null;
 
 	/**
@@ -333,13 +323,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 	 *
 	 * @generated
 	 */
-	private EClass eefReferenceStyleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
 	private EClass eefListStyleEClass = null;
 
 	/**
@@ -424,13 +407,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 	 *
 	 * @generated
 	 */
-	private EClass eefReferenceConditionalStyleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
 	private EClass eefListConditionalStyleEClass = null;
 
 	/**
@@ -1679,86 +1655,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 	 * @generated
 	 */
 	@Override
-	public EClass getEEFReferenceDescription() {
-		return eefReferenceDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EAttribute getEEFReferenceDescription_Multiple() {
-		return (EAttribute) eefReferenceDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EAttribute getEEFReferenceDescription_ValueExpression() {
-		return (EAttribute) eefReferenceDescriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EAttribute getEEFReferenceDescription_DisplayExpression() {
-		return (EAttribute) eefReferenceDescriptionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EAttribute getEEFReferenceDescription_OnClickExpression() {
-		return (EAttribute) eefReferenceDescriptionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EReference getEEFReferenceDescription_Actions() {
-		return (EReference) eefReferenceDescriptionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EReference getEEFReferenceDescription_Style() {
-		return (EReference) eefReferenceDescriptionEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EReference getEEFReferenceDescription_ConditionalStyles() {
-		return (EReference) eefReferenceDescriptionEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
 	public EClass getEEFListDescription() {
 		return eefListDescriptionEClass;
 	}
@@ -2109,16 +2005,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 	 * @generated
 	 */
 	@Override
-	public EClass getEEFReferenceStyle() {
-		return eefReferenceStyleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
 	public EClass getEEFListStyle() {
 		return eefListStyleEClass;
 	}
@@ -2419,26 +2305,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 	 * @generated
 	 */
 	@Override
-	public EClass getEEFReferenceConditionalStyle() {
-		return eefReferenceConditionalStyleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EReference getEEFReferenceConditionalStyle_Style() {
-		return (EReference) eefReferenceConditionalStyleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
 	public EClass getEEFListConditionalStyle() {
 		return eefListConditionalStyleEClass;
 	}
@@ -2682,15 +2548,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 		createEAttribute(eefCustomExpressionEClass, EefPackage.EEF_CUSTOM_EXPRESSION__IDENTIFIER);
 		createEAttribute(eefCustomExpressionEClass, EefPackage.EEF_CUSTOM_EXPRESSION__CUSTOM_EXPRESSION);
 
-		eefReferenceDescriptionEClass = createEClass(EefPackage.EEF_REFERENCE_DESCRIPTION);
-		createEAttribute(eefReferenceDescriptionEClass, EefPackage.EEF_REFERENCE_DESCRIPTION__MULTIPLE);
-		createEAttribute(eefReferenceDescriptionEClass, EefPackage.EEF_REFERENCE_DESCRIPTION__VALUE_EXPRESSION);
-		createEAttribute(eefReferenceDescriptionEClass, EefPackage.EEF_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION);
-		createEAttribute(eefReferenceDescriptionEClass, EefPackage.EEF_REFERENCE_DESCRIPTION__ON_CLICK_EXPRESSION);
-		createEReference(eefReferenceDescriptionEClass, EefPackage.EEF_REFERENCE_DESCRIPTION__ACTIONS);
-		createEReference(eefReferenceDescriptionEClass, EefPackage.EEF_REFERENCE_DESCRIPTION__STYLE);
-		createEReference(eefReferenceDescriptionEClass, EefPackage.EEF_REFERENCE_DESCRIPTION__CONDITIONAL_STYLES);
-
 		eefListDescriptionEClass = createEClass(EefPackage.EEF_LIST_DESCRIPTION);
 		createEAttribute(eefListDescriptionEClass, EefPackage.EEF_LIST_DESCRIPTION__VALUE_EXPRESSION);
 		createEAttribute(eefListDescriptionEClass, EefPackage.EEF_LIST_DESCRIPTION__DISPLAY_EXPRESSION);
@@ -2736,8 +2593,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 
 		eefCustomWidgetStyleEClass = createEClass(EefPackage.EEF_CUSTOM_WIDGET_STYLE);
 
-		eefReferenceStyleEClass = createEClass(EefPackage.EEF_REFERENCE_STYLE);
-
 		eefListStyleEClass = createEClass(EefPackage.EEF_LIST_STYLE);
 
 		eefGroupStyleEClass = createEClass(EefPackage.EEF_GROUP_STYLE);
@@ -2780,9 +2635,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 		createEAttribute(eefWidgetActionEClass, EefPackage.EEF_WIDGET_ACTION__LABEL_EXPRESSION);
 		createEAttribute(eefWidgetActionEClass, EefPackage.EEF_WIDGET_ACTION__ACTION_EXPRESSION);
 
-		eefReferenceConditionalStyleEClass = createEClass(EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE);
-		createEReference(eefReferenceConditionalStyleEClass, EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE__STYLE);
-
 		eefListConditionalStyleEClass = createEClass(EefPackage.EEF_LIST_CONDITIONAL_STYLE);
 		createEReference(eefListConditionalStyleEClass, EefPackage.EEF_LIST_CONDITIONAL_STYLE__STYLE);
 
@@ -2843,7 +2695,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 		eefHyperlinkDescriptionEClass.getESuperTypes().add(this.getEEFWidgetDescription());
 		eefDynamicMappingForEClass.getESuperTypes().add(this.getEEFControlDescription());
 		eefCustomWidgetDescriptionEClass.getESuperTypes().add(this.getEEFWidgetDescription());
-		eefReferenceDescriptionEClass.getESuperTypes().add(this.getEEFWidgetDescription());
 		eefListDescriptionEClass.getESuperTypes().add(this.getEEFWidgetDescription());
 		eefTextStyleEClass.getESuperTypes().add(this.getEEFWidgetStyle());
 		eefLabelStyleEClass.getESuperTypes().add(this.getEEFWidgetStyle());
@@ -2853,7 +2704,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 		eefRadioStyleEClass.getESuperTypes().add(this.getEEFWidgetStyle());
 		eefHyperlinkStyleEClass.getESuperTypes().add(this.getEEFWidgetStyle());
 		eefCustomWidgetStyleEClass.getESuperTypes().add(this.getEEFWidgetStyle());
-		eefReferenceStyleEClass.getESuperTypes().add(this.getEEFWidgetStyle());
 		eefListStyleEClass.getESuperTypes().add(this.getEEFWidgetStyle());
 		eefTextConditionalStyleEClass.getESuperTypes().add(this.getEEFConditionalStyle());
 		eefButtonConditionalStyleEClass.getESuperTypes().add(this.getEEFConditionalStyle());
@@ -2863,7 +2713,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 		eefRadioConditionalStyleEClass.getESuperTypes().add(this.getEEFConditionalStyle());
 		eefHyperlinkConditionalStyleEClass.getESuperTypes().add(this.getEEFConditionalStyle());
 		eefCustomWidgetConditionalStyleEClass.getESuperTypes().add(this.getEEFConditionalStyle());
-		eefReferenceConditionalStyleEClass.getESuperTypes().add(this.getEEFConditionalStyle());
 		eefListConditionalStyleEClass.getESuperTypes().add(this.getEEFConditionalStyle());
 		eefGroupConditionalStyleEClass.getESuperTypes().add(this.getEEFConditionalStyle());
 
@@ -3340,40 +3189,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 				ecorePackage.getEString(),
 				"customExpression", null, 0, 1, EEFCustomExpression.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(eefReferenceDescriptionEClass, EEFReferenceDescription.class,
-				"EEFReferenceDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getEEFReferenceDescription_Multiple(),
-				ecorePackage.getEBoolean(),
-				"multiple", null, 0, 1, EEFReferenceDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getEEFReferenceDescription_ValueExpression(),
-				theEcorePackage.getEString(),
-				"valueExpression", null, 0, 1, EEFReferenceDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getEEFReferenceDescription_DisplayExpression(),
-				theEcorePackage.getEString(),
-				"displayExpression", null, 0, 1, EEFReferenceDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getEEFReferenceDescription_OnClickExpression(),
-				theEcorePackage.getEString(),
-				"onClickExpression", null, 0, 1, EEFReferenceDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getEEFReferenceDescription_Actions(),
-				this.getEEFWidgetAction(),
-				null,
-				"actions", null, 0, -1, EEFReferenceDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getEEFReferenceDescription_Style(),
-				this.getEEFReferenceStyle(),
-				null,
-				"style", null, 0, 1, EEFReferenceDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getEEFReferenceDescription_ConditionalStyles(),
-				this.getEEFReferenceConditionalStyle(),
-				null,
-				"conditionalStyles", null, 0, -1, EEFReferenceDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-
 		initEClass(eefListDescriptionEClass, EEFListDescription.class,
 				"EEFListDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEAttribute(
@@ -3507,9 +3322,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 		initEClass(eefCustomWidgetStyleEClass, EEFCustomWidgetStyle.class,
 				"EEFCustomWidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-		initEClass(eefReferenceStyleEClass, EEFReferenceStyle.class,
-				"EEFReferenceStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
 		initEClass(eefListStyleEClass, EEFListStyle.class,
 				"EEFListStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
@@ -3626,14 +3438,6 @@ public class EefPackageImpl extends EPackageImpl implements EefPackage {
 				ecorePackage.getEString(),
 				"actionExpression", null, 0, 1, EEFWidgetAction.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(eefReferenceConditionalStyleEClass, EEFReferenceConditionalStyle.class,
-				"EEFReferenceConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getEEFReferenceConditionalStyle_Style(),
-				this.getEEFReferenceStyle(),
-				null,
-				"style", null, 0, 1, EEFReferenceConditionalStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); //$NON-NLS-1$
-
 		initEClass(eefListConditionalStyleEClass, EEFListConditionalStyle.class,
 				"EEFListConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(
diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefAdapterFactory.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefAdapterFactory.java
index be78ada72..950143845 100644
--- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefAdapterFactory.java
+++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefAdapterFactory.java
@@ -43,9 +43,6 @@ import org.eclipse.eef.EEFPropertyValidationRuleDescription;
 import org.eclipse.eef.EEFRadioConditionalStyle;
 import org.eclipse.eef.EEFRadioDescription;
 import org.eclipse.eef.EEFRadioStyle;
-import org.eclipse.eef.EEFReferenceConditionalStyle;
-import org.eclipse.eef.EEFReferenceDescription;
-import org.eclipse.eef.EEFReferenceStyle;
 import org.eclipse.eef.EEFRuleAuditDescription;
 import org.eclipse.eef.EEFSelectConditionalStyle;
 import org.eclipse.eef.EEFSelectDescription;
@@ -243,11 +240,6 @@ public class EefAdapterFactory extends AdapterFactoryImpl {
 		}
 
 		@Override
-		public Adapter caseEEFReferenceDescription(EEFReferenceDescription object) {
-			return createEEFReferenceDescriptionAdapter();
-		}
-
-		@Override
 		public Adapter caseEEFListDescription(EEFListDescription object) {
 			return createEEFListDescriptionAdapter();
 		}
@@ -298,11 +290,6 @@ public class EefAdapterFactory extends AdapterFactoryImpl {
 		}
 
 		@Override
-		public Adapter caseEEFReferenceStyle(EEFReferenceStyle object) {
-			return createEEFReferenceStyleAdapter();
-		}
-
-		@Override
 		public Adapter caseEEFListStyle(EEFListStyle object) {
 			return createEEFListStyleAdapter();
 		}
@@ -363,11 +350,6 @@ public class EefAdapterFactory extends AdapterFactoryImpl {
 		}
 
 		@Override
-		public Adapter caseEEFReferenceConditionalStyle(EEFReferenceConditionalStyle object) {
-			return createEEFReferenceConditionalStyleAdapter();
-		}
-
-		@Override
 		public Adapter caseEEFListConditionalStyle(EEFListConditionalStyle object) {
 			return createEEFListConditionalStyleAdapter();
 		}
@@ -747,20 +729,6 @@ public class EefAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.eef.EEFReferenceDescription
-	 * <em>EEF Reference Description</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
-	 * can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-	 * end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.eef.EEFReferenceDescription
-	 * @generated
-	 */
-	public Adapter createEEFReferenceDescriptionAdapter() {
-		return null;
-	}
-
-	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.eef.EEFListDescription
 	 * <em>EEF List Description</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
 	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
@@ -895,20 +863,6 @@ public class EefAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.eef.EEFReferenceStyle
-	 * <em>EEF Reference Style</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
-	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
-	 * end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.eef.EEFReferenceStyle
-	 * @generated
-	 */
-	public Adapter createEEFReferenceStyleAdapter() {
-		return null;
-	}
-
-	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.eef.EEFListStyle <em>EEF List Style</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
 	 * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
@@ -1074,20 +1028,6 @@ public class EefAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.eef.EEFReferenceConditionalStyle
-	 * <em>EEF Reference Conditional Style</em>}'. <!-- begin-user-doc --> This default implementation returns null so
-	 * that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.eef.EEFReferenceConditionalStyle
-	 * @generated
-	 */
-	public Adapter createEEFReferenceConditionalStyleAdapter() {
-		return null;
-	}
-
-	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.eef.EEFListConditionalStyle
 	 * <em>EEF List Conditional Style</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
 	 * we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
diff --git a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefSwitch.java b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefSwitch.java
index d13e21e4b..a9b7d1b78 100644
--- a/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefSwitch.java
+++ b/plugins/org.eclipse.eef/src-gen/org/eclipse/eef/util/EefSwitch.java
@@ -43,9 +43,6 @@ import org.eclipse.eef.EEFPropertyValidationRuleDescription;
 import org.eclipse.eef.EEFRadioConditionalStyle;
 import org.eclipse.eef.EEFRadioDescription;
 import org.eclipse.eef.EEFRadioStyle;
-import org.eclipse.eef.EEFReferenceConditionalStyle;
-import org.eclipse.eef.EEFReferenceDescription;
-import org.eclipse.eef.EEFReferenceStyle;
 import org.eclipse.eef.EEFRuleAuditDescription;
 import org.eclipse.eef.EEFSelectConditionalStyle;
 import org.eclipse.eef.EEFSelectDescription;
@@ -384,20 +381,6 @@ public class EefSwitch<T> extends Switch<T> {
 			}
 			return result;
 		}
-		case EefPackage.EEF_REFERENCE_DESCRIPTION: {
-			EEFReferenceDescription eefReferenceDescription = (EEFReferenceDescription) theEObject;
-			T result = caseEEFReferenceDescription(eefReferenceDescription);
-			if (result == null) {
-				result = caseEEFWidgetDescription(eefReferenceDescription);
-			}
-			if (result == null) {
-				result = caseEEFControlDescription(eefReferenceDescription);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
 		case EefPackage.EEF_LIST_DESCRIPTION: {
 			EEFListDescription eefListDescription = (EEFListDescription) theEObject;
 			T result = caseEEFListDescription(eefListDescription);
@@ -508,17 +491,6 @@ public class EefSwitch<T> extends Switch<T> {
 			}
 			return result;
 		}
-		case EefPackage.EEF_REFERENCE_STYLE: {
-			EEFReferenceStyle eefReferenceStyle = (EEFReferenceStyle) theEObject;
-			T result = caseEEFReferenceStyle(eefReferenceStyle);
-			if (result == null) {
-				result = caseEEFWidgetStyle(eefReferenceStyle);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
 		case EefPackage.EEF_LIST_STYLE: {
 			EEFListStyle eefListStyle = (EEFListStyle) theEObject;
 			T result = caseEEFListStyle(eefListStyle);
@@ -642,17 +614,6 @@ public class EefSwitch<T> extends Switch<T> {
 			}
 			return result;
 		}
-		case EefPackage.EEF_REFERENCE_CONDITIONAL_STYLE: {
-			EEFReferenceConditionalStyle eefReferenceConditionalStyle = (EEFReferenceConditionalStyle) theEObject;
-			T result = caseEEFReferenceConditionalStyle(eefReferenceConditionalStyle);
-			if (result == null) {
-				result = caseEEFConditionalStyle(eefReferenceConditionalStyle);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
 		case EefPackage.EEF_LIST_CONDITIONAL_STYLE: {
 			EEFListConditionalStyle eefListConditionalStyle = (EEFListConditionalStyle) theEObject;
 			T result = caseEEFListConditionalStyle(eefListConditionalStyle);
@@ -1058,21 +1019,6 @@ public class EefSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EEF Reference Description</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
-	 * end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EEF Reference Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEEFReferenceDescription(EEFReferenceDescription object) {
-		return null;
-	}
-
-	/**
 	 * Returns the result of interpreting the object as an instance of '<em>EEF List Description</em>'. <!--
 	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
@@ -1223,21 +1169,6 @@ public class EefSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EEF Reference Style</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
-	 * end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EEF Reference Style</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEEFReferenceStyle(EEFReferenceStyle object) {
-		return null;
-	}
-
-	/**
 	 * Returns the result of interpreting the object as an instance of '<em>EEF List Style</em>'. <!-- begin-user-doc
 	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc
 	 * -->
@@ -1418,21 +1349,6 @@ public class EefSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EEF Reference Conditional Style</em>'. <!--
-	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
-	 * end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EEF Reference Conditional Style</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEEFReferenceConditionalStyle(EEFReferenceConditionalStyle object) {
-		return null;
-	}
-
-	/**
 	 * Returns the result of interpreting the object as an instance of '<em>EEF List Conditional Style</em>'. <!--
 	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
diff --git a/plugins/org.eclipse.eef/src/org/eclipse/eef/util/EEFConditionalStyleToWidgetStyleSwitch.java b/plugins/org.eclipse.eef/src/org/eclipse/eef/util/EEFConditionalStyleToWidgetStyleSwitch.java
index 2f7834705..844ba6837 100644
--- a/plugins/org.eclipse.eef/src/org/eclipse/eef/util/EEFConditionalStyleToWidgetStyleSwitch.java
+++ b/plugins/org.eclipse.eef/src/org/eclipse/eef/util/EEFConditionalStyleToWidgetStyleSwitch.java
@@ -16,7 +16,6 @@ import org.eclipse.eef.EEFHyperlinkConditionalStyle;
 import org.eclipse.eef.EEFLabelConditionalStyle;
 import org.eclipse.eef.EEFListConditionalStyle;
 import org.eclipse.eef.EEFRadioConditionalStyle;
-import org.eclipse.eef.EEFReferenceConditionalStyle;
 import org.eclipse.eef.EEFSelectConditionalStyle;
 import org.eclipse.eef.EEFTextConditionalStyle;
 import org.eclipse.eef.EEFWidgetStyle;
@@ -80,16 +79,6 @@ public class EEFConditionalStyleToWidgetStyleSwitch extends EefSwitch<EEFWidgetS
 	/**
 	 * {@inheritDoc}
 	 *
-	 * @see org.eclipse.eef.util.EefSwitch#caseEEFReferenceConditionalStyle(org.eclipse.eef.EEFReferenceConditionalStyle)
-	 */
-	@Override
-	public EEFWidgetStyle caseEEFReferenceConditionalStyle(EEFReferenceConditionalStyle object) {
-		return object.getStyle();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
 	 * @see org.eclipse.eef.util.EefSwitch#caseEEFSelectConditionalStyle(org.eclipse.eef.EEFSelectConditionalStyle)
 	 */
 	@Override
diff --git a/plugins/org.eclipse.eef/src/org/eclipse/eef/util/EEFDescriptionToConditionalStylesSwitch.java b/plugins/org.eclipse.eef/src/org/eclipse/eef/util/EEFDescriptionToConditionalStylesSwitch.java
index 23dc905de..d17590cab 100644
--- a/plugins/org.eclipse.eef/src/org/eclipse/eef/util/EEFDescriptionToConditionalStylesSwitch.java
+++ b/plugins/org.eclipse.eef/src/org/eclipse/eef/util/EEFDescriptionToConditionalStylesSwitch.java
@@ -20,7 +20,6 @@ import org.eclipse.eef.EEFHyperlinkDescription;
 import org.eclipse.eef.EEFLabelDescription;
 import org.eclipse.eef.EEFListDescription;
 import org.eclipse.eef.EEFRadioDescription;
-import org.eclipse.eef.EEFReferenceDescription;
 import org.eclipse.eef.EEFSelectDescription;
 import org.eclipse.eef.EEFTextDescription;
 import org.eclipse.emf.ecore.EObject;
@@ -108,16 +107,6 @@ public class EEFDescriptionToConditionalStylesSwitch extends EefSwitch<List<EEFC
 	/**
 	 * {@inheritDoc}
 	 *
-	 * @see org.eclipse.eef.util.EefSwitch#caseEEFReferenceDescription(org.eclipse.eef.EEFReferenceDescription)
-	 */
-	@Override
-	public List<EEFConditionalStyle> caseEEFReferenceDescription(EEFReferenceDescription object) {
-		return this.asConditionalStyleList(object.getConditionalStyles());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
 	 * @see org.eclipse.eef.util.EefSwitch#caseEEFSelectDescription(org.eclipse.eef.EEFSelectDescription)
 	 */
 	@Override
diff --git a/plugins/org.eclipse.eef/src/org/eclipse/eef/util/EEFDescriptionToWidgetStyleSwitch.java b/plugins/org.eclipse.eef/src/org/eclipse/eef/util/EEFDescriptionToWidgetStyleSwitch.java
index b75520cbc..eaad2d3e1 100644
--- a/plugins/org.eclipse.eef/src/org/eclipse/eef/util/EEFDescriptionToWidgetStyleSwitch.java
+++ b/plugins/org.eclipse.eef/src/org/eclipse/eef/util/EEFDescriptionToWidgetStyleSwitch.java
@@ -16,7 +16,6 @@ import org.eclipse.eef.EEFHyperlinkDescription;
 import org.eclipse.eef.EEFLabelDescription;
 import org.eclipse.eef.EEFListDescription;
 import org.eclipse.eef.EEFRadioDescription;
-import org.eclipse.eef.EEFReferenceDescription;
 import org.eclipse.eef.EEFWidgetStyle;
 
 /**
@@ -78,16 +77,6 @@ public class EEFDescriptionToWidgetStyleSwitch extends EefSwitch<EEFWidgetStyle>
 	/**
 	 * {@inheritDoc}
 	 *
-	 * @see org.eclipse.eef.util.EefSwitch#caseEEFReferenceDescription(org.eclipse.eef.EEFReferenceDescription)
-	 */
-	@Override
-	public EEFWidgetStyle caseEEFReferenceDescription(EEFReferenceDescription object) {
-		return object.getStyle();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 *
 	 * @see org.eclipse.eef.util.EefSwitch#caseEEFSelectDescription(org.eclipse.eef.EEFSelectDescription)
 	 */
 	@Override