[500681] Remove the old reference widget

Bug: 500681
Change-Id: Ie3da06ffc3f7864cd316f8049690dc01cac12fa7
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>

43 files changed, 986 insertions, 3240 deletions

diff --git a/plugins/org.eclipse.sirius.editor.properties/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.editor.properties/META-INF/MANIFEST.MF
index 22e9f45ff6..d356f2bbae 100644
--- a/plugins/org.eclipse.sirius.editor.properties/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.editor.properties/META-INF/MANIFEST.MF
@@ -38,7 +38,6 @@ Export-Package: org.eclipse.sirius.editor.properties.tools.internal.menu;version
  org.eclipse.sirius.properties.editor.properties.filters.properties.pagedescription;version="4.1.0";x-internal:=true,
  org.eclipse.sirius.properties.editor.properties.filters.properties.propertyvalidationrule;version="4.1.0";x-internal:=true,
  org.eclipse.sirius.properties.editor.properties.filters.properties.radiodescription;version="4.1.0";x-internal:=true,
- org.eclipse.sirius.properties.editor.properties.filters.properties.referencedescription;version="4.1.0";x-internal:=true,
  org.eclipse.sirius.properties.editor.properties.filters.properties.selectdescription;version="4.1.0";x-internal:=true,
  org.eclipse.sirius.properties.editor.properties.filters.properties.textareadescription;version="4.1.0";x-internal:=true,
  org.eclipse.sirius.properties.editor.properties.filters.properties.textdescription;version="4.1.0";x-internal:=true,
@@ -67,7 +66,6 @@ Export-Package: org.eclipse.sirius.editor.properties.tools.internal.menu;version
  org.eclipse.sirius.properties.editor.properties.sections.properties.pagedescription;version="4.1.0";x-internal:=true,
  org.eclipse.sirius.properties.editor.properties.sections.properties.propertyvalidationrule;version="4.1.0";x-internal:=true,
  org.eclipse.sirius.properties.editor.properties.sections.properties.radiodescription;version="4.1.0";x-internal:=true,
- org.eclipse.sirius.properties.editor.properties.sections.properties.referencedescription;version="4.1.0";x-internal:=true,
  org.eclipse.sirius.properties.editor.properties.sections.properties.selectdescription;version="4.1.0";x-internal:=true,
  org.eclipse.sirius.properties.editor.properties.sections.properties.textareadescription;version="4.1.0";x-internal:=true,
  org.eclipse.sirius.properties.editor.properties.sections.properties.textdescription;version="4.1.0";x-internal:=true,
diff --git a/plugins/org.eclipse.sirius.editor.properties/help/contexts.xml b/plugins/org.eclipse.sirius.editor.properties/help/contexts.xml
index 2e8bd21fd0..f60ed3dbd6 100644
--- a/plugins/org.eclipse.sirius.editor.properties/help/contexts.xml
+++ b/plugins/org.eclipse.sirius.editor.properties/help/contexts.xml
@@ -237,18 +237,6 @@
    
       </description>
    </context>
-   <context id="ReferenceDescription">
-     <description>
-       Represents a reference in the user interface.
-
-       
-         
-   <!-- Start of user code ReferenceDescription description -->
-   
-   <!-- End of user code ReferenceDescription description -->
-   
-      </description>
-   </context>
    <context id="ListDescription">
      <description>
        Represents a list in the user interface.
@@ -404,17 +392,6 @@
    
       </description>
    </context>
-   <context id="ReferenceWidgetStyle">
-     <description>
-       
-       
-         
-   <!-- Start of user code ReferenceWidgetStyle description -->
-   
-   <!-- End of user code ReferenceWidgetStyle description -->
-   
-      </description>
-   </context>
    <context id="ListWidgetStyle">
      <description>
        
@@ -536,17 +513,6 @@
    
       </description>
    </context>
-   <context id="ReferenceWidgetConditionalStyle">
-     <description>
-       
-       
-         
-   <!-- Start of user code ReferenceWidgetConditionalStyle description -->
-   
-   <!-- End of user code ReferenceWidgetConditionalStyle description -->
-   
-      </description>
-   </context>
    <context id="ListWidgetConditionalStyle">
      <description>
        
diff --git a/plugins/org.eclipse.sirius.editor.properties/plugin.xml b/plugins/org.eclipse.sirius.editor.properties/plugin.xml
index 61e97bfc30..f34fbe1a68 100644
--- a/plugins/org.eclipse.sirius.editor.properties/plugin.xml
+++ b/plugins/org.eclipse.sirius.editor.properties/plugin.xml
@@ -286,29 +286,6 @@
         <input type="org.eclipse.sirius.properties.ListDescription"/>
       </propertySection>
   	  <propertySection
-               class="org.eclipse.sirius.properties.editor.properties.sections.properties.referencedescription.ReferenceDescriptionDisplayExpressionPropertySection"
-               id="properties.section.referenceDescription.DisplayExpression"
-               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.referencedescription.ReferenceDescriptionDisplayExpressionFilter"
-               afterSection="properties.section.referenceDescription.ValueExpression"
-                tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.properties.ReferenceDescription"/>
-      </propertySection>
-  	  <propertySection
-               class="org.eclipse.sirius.properties.editor.properties.sections.properties.referencedescription.ReferenceDescriptionValueExpressionPropertySection"
-               id="properties.section.referenceDescription.ValueExpression"
-               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.referencedescription.ReferenceDescriptionValueExpressionFilter"
-               afterSection="properties.section.referenceDescription.Multiple"
-                tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.properties.ReferenceDescription"/>
-      </propertySection>
-  	  <propertySection
-               class="org.eclipse.sirius.properties.editor.properties.sections.properties.referencedescription.ReferenceDescriptionMultiplePropertySection"
-               id="properties.section.referenceDescription.Multiple"
-               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.referencedescription.ReferenceDescriptionMultipleFilter"
-                tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.properties.ReferenceDescription"/>
-      </propertySection>
-  	  <propertySection
                class="org.eclipse.sirius.properties.editor.properties.sections.properties.radiodescription.RadioDescriptionNumberOfColumnsPropertySection"
                id="properties.section.radioDescription.NumberOfColumns"
                filter="org.eclipse.sirius.properties.editor.properties.filters.properties.radiodescription.RadioDescriptionNumberOfColumnsFilter"
diff --git a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/referencedescription/ReferenceDescriptionDisplayExpressionFilter.java b/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/referencedescription/ReferenceDescriptionDisplayExpressionFilter.java
deleted file mode 100644
index 9fccc8443f..0000000000
--- a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/referencedescription/ReferenceDescriptionDisplayExpressionFilter.java
+++ /dev/null
@@ -1,45 +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.sirius.properties.editor.properties.filters.properties.referencedescription;
-
-// Start of user code specific imports
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
-import org.eclipse.sirius.properties.PropertiesPackage;
-
-// End of user code specific imports
-
-/**
- * A filter for the displayExpression property section.
- */
-public class ReferenceDescriptionDisplayExpressionFilter extends ViewpointPropertyFilter {
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected EStructuralFeature getFeature() {
-        return PropertiesPackage.eINSTANCE.getReferenceDescription_DisplayExpression();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.properties.ReferenceDescription;
-    }
-
-    // Start of user code user methods
-
-    // End of user code user methods
-
-}
diff --git a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/referencedescription/ReferenceDescriptionMultipleFilter.java b/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/referencedescription/ReferenceDescriptionMultipleFilter.java
deleted file mode 100644
index 457dc0f7f1..0000000000
--- a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/referencedescription/ReferenceDescriptionMultipleFilter.java
+++ /dev/null
@@ -1,45 +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.sirius.properties.editor.properties.filters.properties.referencedescription;
-
-// Start of user code specific imports
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
-import org.eclipse.sirius.properties.PropertiesPackage;
-
-// End of user code specific imports
-
-/**
- * A filter for the multiple property section.
- */
-public class ReferenceDescriptionMultipleFilter extends ViewpointPropertyFilter {
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected EStructuralFeature getFeature() {
-        return PropertiesPackage.eINSTANCE.getReferenceDescription_Multiple();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.properties.ReferenceDescription;
-    }
-
-    // Start of user code user methods
-
-    // End of user code user methods
-
-}
diff --git a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/referencedescription/ReferenceDescriptionValueExpressionFilter.java b/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/referencedescription/ReferenceDescriptionValueExpressionFilter.java
deleted file mode 100644
index c8523cbaeb..0000000000
--- a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/referencedescription/ReferenceDescriptionValueExpressionFilter.java
+++ /dev/null
@@ -1,45 +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.sirius.properties.editor.properties.filters.properties.referencedescription;
-
-// Start of user code specific imports
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
-import org.eclipse.sirius.properties.PropertiesPackage;
-
-// End of user code specific imports
-
-/**
- * A filter for the valueExpression property section.
- */
-public class ReferenceDescriptionValueExpressionFilter extends ViewpointPropertyFilter {
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected EStructuralFeature getFeature() {
-        return PropertiesPackage.eINSTANCE.getReferenceDescription_ValueExpression();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.properties.ReferenceDescription;
-    }
-
-    // Start of user code user methods
-
-    // End of user code user methods
-
-}
diff --git a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/referencedescription/ReferenceDescriptionDisplayExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/referencedescription/ReferenceDescriptionDisplayExpressionPropertySection.java
deleted file mode 100644
index e50d1febff..0000000000
--- a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/referencedescription/ReferenceDescriptionDisplayExpressionPropertySection.java
+++ /dev/null
@@ -1,121 +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.sirius.properties.editor.properties.sections.properties.referencedescription;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
-import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
-import org.eclipse.sirius.editor.tools.api.assist.TypeContentProposalProvider;
-import org.eclipse.sirius.editor.tools.internal.presentation.TextWithContentProposalDialog;
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-// End of user code imports
-
-/**
- * A section for the displayExpression property of a ReferenceDescription
- * object.
- */
-public class ReferenceDescriptionDisplayExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient {
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
-     */
-    @Override
-    protected String getDefaultLabelText() {
-        return "DisplayExpression"; //$NON-NLS-1$
-    }
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
-     */
-    @Override
-    protected String getLabelText() {
-        String labelText;
-        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
-        // Start of user code get label text
-
-        // End of user code get label text
-        return labelText;
-    }
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
-     */
-    @Override
-    public EAttribute getFeature() {
-        return PropertiesPackage.eINSTANCE.getReferenceDescription_DisplayExpression();
-    }
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
-     */
-    @Override
-    protected Object getFeatureValue(String newText) {
-        return newText;
-    }
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
-     */
-    @Override
-    protected boolean isEqual(String newText) {
-        return getFeatureAsText().equals(newText);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
-        super.createControls(parent, tabbedPropertySheetPage);
-        /*
-         * We set the color as it's a InterpretedExpression
-         */
-        text.setBackground(SiriusEditor.getColorRegistry().get("yellow"));
-
-        TypeContentProposalProvider.bindPluginsCompletionProcessors(this, text);
-
-        // Start of user code create controls
-
-        // End of user code create controls
-
-    }
-
-    @Override
-    protected SelectionListener createButtonListener() {
-        return new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), ReferenceDescriptionDisplayExpressionPropertySection.this, text.getText());
-                dialog.open();
-                text.setText(dialog.getResult());
-                handleTextModified();
-            }
-        };
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected String getPropertyDescription() {
-        return "";
-    }
-
-    // Start of user code user operations
-
-    // End of user code user operations
-}
diff --git a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/referencedescription/ReferenceDescriptionMultiplePropertySection.java b/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/referencedescription/ReferenceDescriptionMultiplePropertySection.java
deleted file mode 100644
index e09e135dd0..0000000000
--- a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/referencedescription/ReferenceDescriptionMultiplePropertySection.java
+++ /dev/null
@@ -1,109 +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.sirius.properties.editor.properties.sections.properties.referencedescription;
-
-// Start of user code imports
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.sirius.editor.properties.sections.common.AbstractCheckBoxPropertySection;
-// End of user code imports
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-/**
- * A section for the multiple property of a ReferenceDescription object.
- */
-public class ReferenceDescriptionMultiplePropertySection extends AbstractCheckBoxPropertySection {
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractCheckBoxPropertySection#getDefaultLabelText()
-     */
-    @Override
-    protected String getDefaultLabelText() {
-        return "Multiple"; //$NON-NLS-1$
-    }
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractCheckBoxPropertySection#getLabelText()
-     */
-    @Override
-    protected String getLabelText() {
-        String labelText;
-        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
-        // Start of user code get label text
-
-        // End of user code get label text
-        return labelText;
-    }
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractCheckBoxPropertySection#getFeature()
-     */
-    @Override
-    protected EAttribute getFeature() {
-        return PropertiesPackage.eINSTANCE.getReferenceDescription_Multiple();
-    }
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractCheckBoxPropertySection#getFeatureAsInteger()
-     */
-    @Override
-    protected String getDefaultFeatureAsText() {
-        String value = new String();
-        if (eObject.eGet(getFeature()) != null) {
-            value = toBoolean(eObject.eGet(getFeature()).toString()).toString();
-        }
-        return value;
-    }
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractCheckBoxPropertySection#getFeatureValue(int)
-     */
-    @Override
-    protected Object getFeatureValue(String newText) {
-        return toBoolean(newText);
-    }
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractCheckBoxPropertySection#isEqual(int)
-     */
-    @Override
-    protected boolean isEqual(String newText) {
-        boolean equal = true;
-        if (toBoolean(newText) != null) {
-            equal = getFeatureAsText().equals(toBoolean(newText).toString());
-        } else {
-            refresh();
-        }
-        return equal;
-    }
-
-    /**
-     * Converts the given text to the boolean it represents if applicable.
-     *
-     * @return The boolean the given text represents if applicable,
-     *         <code>null</code> otherwise.
-     */
-    private Boolean toBoolean(String text) {
-        Boolean booleanValue = null;
-        if (text.toLowerCase().matches("true|false")) {
-            booleanValue = Boolean.parseBoolean(text);
-        }
-        return booleanValue;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
-        super.createControls(parent, tabbedPropertySheetPage);
-    }
-}
diff --git a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/referencedescription/ReferenceDescriptionValueExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/referencedescription/ReferenceDescriptionValueExpressionPropertySection.java
deleted file mode 100644
index 0763341db2..0000000000
--- a/plugins/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/referencedescription/ReferenceDescriptionValueExpressionPropertySection.java
+++ /dev/null
@@ -1,120 +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.sirius.properties.editor.properties.sections.properties.referencedescription;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
-import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
-import org.eclipse.sirius.editor.tools.api.assist.TypeContentProposalProvider;
-import org.eclipse.sirius.editor.tools.internal.presentation.TextWithContentProposalDialog;
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-// End of user code imports
-
-/**
- * A section for the valueExpression property of a ReferenceDescription object.
- */
-public class ReferenceDescriptionValueExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient {
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
-     */
-    @Override
-    protected String getDefaultLabelText() {
-        return "ValueExpression"; //$NON-NLS-1$
-    }
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
-     */
-    @Override
-    protected String getLabelText() {
-        String labelText;
-        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
-        // Start of user code get label text
-
-        // End of user code get label text
-        return labelText;
-    }
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
-     */
-    @Override
-    public EAttribute getFeature() {
-        return PropertiesPackage.eINSTANCE.getReferenceDescription_ValueExpression();
-    }
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
-     */
-    @Override
-    protected Object getFeatureValue(String newText) {
-        return newText;
-    }
-
-    /**
-     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
-     */
-    @Override
-    protected boolean isEqual(String newText) {
-        return getFeatureAsText().equals(newText);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
-        super.createControls(parent, tabbedPropertySheetPage);
-        /*
-         * We set the color as it's a InterpretedExpression
-         */
-        text.setBackground(SiriusEditor.getColorRegistry().get("yellow"));
-
-        TypeContentProposalProvider.bindPluginsCompletionProcessors(this, text);
-
-        // Start of user code create controls
-
-        // End of user code create controls
-
-    }
-
-    @Override
-    protected SelectionListener createButtonListener() {
-        return new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), ReferenceDescriptionValueExpressionPropertySection.this, text.getText());
-                dialog.open();
-                text.setText(dialog.getResult());
-                handleTextModified();
-            }
-        };
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected String getPropertyDescription() {
-        return "";
-    }
-
-    // Start of user code user operations
-
-    // End of user code user operations
-}
diff --git a/plugins/org.eclipse.sirius.properties.edit/plugin.properties b/plugins/org.eclipse.sirius.properties.edit/plugin.properties
index 7fb338e744..9c3439ab1e 100644
--- a/plugins/org.eclipse.sirius.properties.edit/plugin.properties
+++ b/plugins/org.eclipse.sirius.properties.edit/plugin.properties
@@ -175,20 +175,9 @@ _UI_GridLayoutDescription_numberOfColumns_feature = Number of Columns
 _UI_GridLayoutDescription_makeColumnsWithEqualWidth_feature = Make Columns With Equal Width
 _UI_FILL_LAYOUT_ORIENTATION_VERTICAL_literal = VERTICAL
 _UI_FILL_LAYOUT_ORIENTATION_HORIZONTAL_literal = HORIZONTAL
-_UI_ReferenceDescription_type = Reference
 _UI_WidgetAction_type = Widget Action
-_UI_ReferenceWidgetStyle_type = Style
-_UI_ReferenceDescription_multiple_feature = Multiple
-_UI_ReferenceDescription_valueExpression_feature = Value Expression
-_UI_ReferenceDescription_displayExpression_feature = Display Expression
-_UI_ReferenceDescription_onClickOperation_feature = On Click Operation
-_UI_ReferenceDescription_actions_feature = Actions
-_UI_ReferenceDescription_style_feature = Style
 _UI_WidgetAction_labelExpression_feature = Label Expression
 _UI_WidgetAction_initialOperation_feature = Initial Operation
-_UI_ReferenceWidgetConditionalStyle_type = Conditional Style
-_UI_ReferenceDescription_conditionalStyles_feature = Conditional Styles
-_UI_ReferenceWidgetConditionalStyle_style_feature = Style
 _UI_GroupStyle_type = Style
 _UI_GroupDescription_style_feature = Style
 _UI_GroupStyle_backgroundColor_feature = Background Color
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
index 145c8a2b04..86c342a830 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
@@ -167,8 +167,6 @@ public class ContainerDescriptionItemProvider extends ControlDescriptionItemProv
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createRadioDescription()));
 
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createReferenceDescription()));
-
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createListDescription()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createCustomDescription()));
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java
index 396e190b2f..54770e3b8c 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java
@@ -186,8 +186,6 @@ public class DynamicMappingIfItemProvider extends ItemProviderAdapter
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.DYNAMIC_MAPPING_IF__WIDGET, PropertiesFactory.eINSTANCE.createRadioDescription()));
 
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.DYNAMIC_MAPPING_IF__WIDGET, PropertiesFactory.eINSTANCE.createReferenceDescription()));
-
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.DYNAMIC_MAPPING_IF__WIDGET, PropertiesFactory.eINSTANCE.createListDescription()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.DYNAMIC_MAPPING_IF__WIDGET, PropertiesFactory.eINSTANCE.createCustomDescription()));
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
index f9af1a70b5..be206090ff 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
@@ -260,8 +260,6 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createRadioDescription()));
 
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createReferenceDescription()));
-
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createCustomDescription()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createHyperlinkDescription()));
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
index 84a94035c4..ef08b535e5 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
@@ -559,31 +559,6 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.properties.ReferenceDescription} instances.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected ReferenceDescriptionItemProvider referenceDescriptionItemProvider;
-
-    /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.properties.ReferenceDescription}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public Adapter createReferenceDescriptionAdapter() {
-        if (referenceDescriptionItemProvider == null) {
-            referenceDescriptionItemProvider = new ReferenceDescriptionItemProvider(this);
-        }
-
-        return referenceDescriptionItemProvider;
-    }
-
-    /**
-     * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.ListDescription} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -934,31 +909,6 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.properties.ReferenceWidgetStyle} instances.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected ReferenceWidgetStyleItemProvider referenceWidgetStyleItemProvider;
-
-    /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.properties.ReferenceWidgetStyle}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public Adapter createReferenceWidgetStyleAdapter() {
-        if (referenceWidgetStyleItemProvider == null) {
-            referenceWidgetStyleItemProvider = new ReferenceWidgetStyleItemProvider(this);
-        }
-
-        return referenceWidgetStyleItemProvider;
-    }
-
-    /**
-     * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.ListWidgetStyle} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -1209,31 +1159,6 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected ReferenceWidgetConditionalStyleItemProvider referenceWidgetConditionalStyleItemProvider;
-
-    /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle}.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public Adapter createReferenceWidgetConditionalStyleAdapter() {
-        if (referenceWidgetConditionalStyleItemProvider == null) {
-            referenceWidgetConditionalStyleItemProvider = new ReferenceWidgetConditionalStyleItemProvider(this);
-        }
-
-        return referenceWidgetConditionalStyleItemProvider;
-    }
-
-    /**
-     * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.ListWidgetConditionalStyle}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -1519,9 +1444,6 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
         if (radioDescriptionItemProvider != null) {
             radioDescriptionItemProvider.dispose();
         }
-        if (referenceDescriptionItemProvider != null) {
-            referenceDescriptionItemProvider.dispose();
-        }
         if (listDescriptionItemProvider != null) {
             listDescriptionItemProvider.dispose();
         }
@@ -1564,9 +1486,6 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
         if (customWidgetStyleItemProvider != null) {
             customWidgetStyleItemProvider.dispose();
         }
-        if (referenceWidgetStyleItemProvider != null) {
-            referenceWidgetStyleItemProvider.dispose();
-        }
         if (listWidgetStyleItemProvider != null) {
             listWidgetStyleItemProvider.dispose();
         }
@@ -1597,9 +1516,6 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
         if (customWidgetConditionalStyleItemProvider != null) {
             customWidgetConditionalStyleItemProvider.dispose();
         }
-        if (referenceWidgetConditionalStyleItemProvider != null) {
-            referenceWidgetConditionalStyleItemProvider.dispose();
-        }
         if (listWidgetConditionalStyleItemProvider != null) {
             listWidgetConditionalStyleItemProvider.dispose();
         }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ReferenceDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ReferenceDescriptionItemProvider.java
deleted file mode 100644
index 2b4967ef05..0000000000
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ReferenceDescriptionItemProvider.java
+++ /dev/null
@@ -1,215 +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.sirius.properties.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-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;
-import org.eclipse.sirius.properties.PropertiesFactory;
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.properties.ReferenceDescription;
-import org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle;
-import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
-
-/**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.properties.ReferenceDescription} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ReferenceDescriptionItemProvider extends WidgetDescriptionItemProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    public ReferenceDescriptionItemProvider(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);
-        }
-        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_ReferenceDescription_multiple_feature"), //$NON-NLS-1$
-                        getString("_UI_PropertyDescriptor_description", "_UI_ReferenceDescription_multiple_feature", "_UI_ReferenceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                        PropertiesPackage.Literals.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_ReferenceDescription_valueExpression_feature"), //$NON-NLS-1$
-                        getString("_UI_PropertyDescriptor_description", "_UI_ReferenceDescription_valueExpression_feature", "_UI_ReferenceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                        PropertiesPackage.Literals.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_ReferenceDescription_displayExpression_feature"), //$NON-NLS-1$
-                getString("_UI_PropertyDescriptor_description", "_UI_ReferenceDescription_displayExpression_feature", "_UI_ReferenceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                PropertiesPackage.Literals.REFERENCE_DESCRIPTION__DISPLAY_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(PropertiesPackage.Literals.REFERENCE_DESCRIPTION__ON_CLICK_OPERATION);
-            childrenFeatures.add(PropertiesPackage.Literals.REFERENCE_DESCRIPTION__ACTIONS);
-            childrenFeatures.add(PropertiesPackage.Literals.REFERENCE_DESCRIPTION__STYLE);
-            childrenFeatures.add(PropertiesPackage.Literals.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 ReferenceDescription.gif. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ReferenceDescription")); //$NON-NLS-1$
-    }
-
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public String getText(Object object) {
-        String label = ((ReferenceDescription) object).getIdentifier();
-        return label == null || label.length() == 0 ? getString("_UI_ReferenceDescription_type") : //$NON-NLS-1$
-                getString("_UI_ReferenceDescription_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(ReferenceDescription.class)) {
-        case PropertiesPackage.REFERENCE_DESCRIPTION__MULTIPLE:
-        case PropertiesPackage.REFERENCE_DESCRIPTION__VALUE_EXPRESSION:
-        case PropertiesPackage.REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
-        case PropertiesPackage.REFERENCE_DESCRIPTION__ON_CLICK_OPERATION:
-        case PropertiesPackage.REFERENCE_DESCRIPTION__ACTIONS:
-        case PropertiesPackage.REFERENCE_DESCRIPTION__STYLE:
-        case PropertiesPackage.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 NOT
-     */
-    @Override
-    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-        super.collectNewChildDescriptors(newChildDescriptors, object);
-
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.REFERENCE_DESCRIPTION__ON_CLICK_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
-
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.REFERENCE_DESCRIPTION__ACTIONS, PropertiesFactory.eINSTANCE.createWidgetAction()));
-
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.REFERENCE_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createReferenceWidgetStyle()));
-
-        ReferenceWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createReferenceWidgetConditionalStyle();
-        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createReferenceWidgetStyle());
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.REFERENCE_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ReferenceWidgetConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ReferenceWidgetConditionalStyleItemProvider.java
deleted file mode 100644
index da3a4dc80a..0000000000
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ReferenceWidgetConditionalStyleItemProvider.java
+++ /dev/null
@@ -1,150 +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.sirius.properties.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-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;
-import org.eclipse.sirius.properties.PropertiesFactory;
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle;
-
-/**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle} object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ReferenceWidgetConditionalStyleItemProvider extends WidgetConditionalStyleItemProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    public ReferenceWidgetConditionalStyleItemProvider(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(PropertiesPackage.Literals.REFERENCE_WIDGET_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 ReferenceWidgetConditionalStyle.gif. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ReferenceWidgetConditionalStyle")); //$NON-NLS-1$
-    }
-
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public String getText(Object object) {
-        String label = ((ReferenceWidgetConditionalStyle) object).getPreconditionExpression();
-        return label == null || label.length() == 0 ? getString("_UI_ReferenceWidgetConditionalStyle_type") : //$NON-NLS-1$
-                getString("_UI_ReferenceWidgetConditionalStyle_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(ReferenceWidgetConditionalStyle.class)) {
-        case PropertiesPackage.REFERENCE_WIDGET_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(PropertiesPackage.Literals.REFERENCE_WIDGET_CONDITIONAL_STYLE__STYLE, PropertiesFactory.eINSTANCE.createReferenceWidgetStyle()));
-    }
-
-}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ReferenceWidgetStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ReferenceWidgetStyleItemProvider.java
deleted file mode 100644
index f61a3b227a..0000000000
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ReferenceWidgetStyleItemProvider.java
+++ /dev/null
@@ -1,105 +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.sirius.properties.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.sirius.properties.ReferenceWidgetStyle;
-
-/**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.properties.ReferenceWidgetStyle} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ReferenceWidgetStyleItemProvider extends WidgetStyleItemProvider {
-    /**
-     * This constructs an instance from a factory and a notifier. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    public ReferenceWidgetStyleItemProvider(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 ReferenceWidgetStyle.gif. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public Object getImage(Object object) {
-        return overlayImage(object, getResourceLocator().getImage("full/obj16/ReferenceWidgetStyle")); //$NON-NLS-1$
-    }
-
-    /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public String getText(Object object) {
-        String label = ((ReferenceWidgetStyle) object).getLabelFontNameExpression();
-        return label == null || label.length() == 0 ? getString("_UI_ReferenceWidgetStyle_type") : //$NON-NLS-1$
-                getString("_UI_ReferenceWidgetStyle_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.sirius.properties.ext.widgets.reference.edit/plugin.properties b/plugins/org.eclipse.sirius.properties.ext.widgets.reference.edit/plugin.properties
index 5963821682..a0a91739f5 100644
--- a/plugins/org.eclipse.sirius.properties.ext.widgets.reference.edit/plugin.properties
+++ b/plugins/org.eclipse.sirius.properties.ext.widgets.reference.edit/plugin.properties
@@ -20,7 +20,7 @@ _UI_CreateSibling_description = Create a new sibling of type {0} for the selecte
 
 _UI_PropertyDescriptor_description = The {0} of the {1}
 
-_UI_ExtReferenceDescription_type = Reference [ext]
+_UI_ExtReferenceDescription_type = Reference
 _UI_Unknown_type = Object
 
 _UI_Unknown_datatype= Value
diff --git a/plugins/org.eclipse.sirius.properties/model/properties.ecore b/plugins/org.eclipse.sirius.properties/model/properties.ecore
index cd3a0bd36d..060551bf28 100644
--- a/plugins/org.eclipse.sirius.properties/model/properties.ecore
+++ b/plugins/org.eclipse.sirius.properties/model/properties.ecore
@@ -217,34 +217,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="conditionalStyles" upperBound="-1"
         eType="#//RadioWidgetConditionalStyle" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReferenceDescription" eSuperTypes="#//WidgetDescription">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents a reference in the user interface."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiple" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The initial value."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Represents how to display the value."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="onClickOperation" eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/InitialOperation"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Defines the expected behavior  when the user clicks on the hyperlink."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="actions" upperBound="-1"
-        eType="#//WidgetAction" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//ReferenceWidgetStyle"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionalStyles" upperBound="-1"
-        eType="#//ReferenceWidgetConditionalStyle" containment="true"/>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ListDescription" eSuperTypes="#//WidgetDescription">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Represents a list in the user interface."/>
@@ -343,7 +315,6 @@
   <eClassifiers xsi:type="ecore:EClass" name="ButtonWidgetStyle" eSuperTypes="#//WidgetStyle"/>
   <eClassifiers xsi:type="ecore:EClass" name="SelectWidgetStyle" eSuperTypes="#//WidgetStyle"/>
   <eClassifiers xsi:type="ecore:EClass" name="CustomWidgetStyle" eSuperTypes="#//WidgetStyle"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ReferenceWidgetStyle" eSuperTypes="#//WidgetStyle"/>
   <eClassifiers xsi:type="ecore:EClass" name="ListWidgetStyle" eSuperTypes="#//WidgetStyle"/>
   <eClassifiers xsi:type="ecore:EClass" name="HyperlinkWidgetStyle" eSuperTypes="#//WidgetStyle">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontNameExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
@@ -403,10 +374,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//CustomWidgetStyle"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReferenceWidgetConditionalStyle" eSuperTypes="#//WidgetConditionalStyle">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//ReferenceWidgetStyle"
-        containment="true"/>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ListWidgetConditionalStyle" eSuperTypes="#//WidgetConditionalStyle">
     <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//ListWidgetStyle"
         containment="true"/>
diff --git a/plugins/org.eclipse.sirius.properties/model/properties.genmodel b/plugins/org.eclipse.sirius.properties/model/properties.genmodel
index 69008cfab8..c79cf0b52e 100644
--- a/plugins/org.eclipse.sirius.properties/model/properties.genmodel
+++ b/plugins/org.eclipse.sirius.properties/model/properties.genmodel
@@ -137,15 +137,6 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//RadioDescription/numberOfColumns"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//RadioDescription/conditionalStyles"/>
     </genClasses>
-    <genClasses ecoreClass="properties.ecore#//ReferenceDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//ReferenceDescription/multiple"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//ReferenceDescription/valueExpression"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//ReferenceDescription/displayExpression"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//ReferenceDescription/onClickOperation"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//ReferenceDescription/actions"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//ReferenceDescription/style"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//ReferenceDescription/conditionalStyles"/>
-    </genClasses>
     <genClasses ecoreClass="properties.ecore#//ListDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//ListDescription/valueExpression"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//ListDescription/displayExpression"/>
@@ -205,7 +196,6 @@
     <genClasses ecoreClass="properties.ecore#//ButtonWidgetStyle"/>
     <genClasses ecoreClass="properties.ecore#//SelectWidgetStyle"/>
     <genClasses ecoreClass="properties.ecore#//CustomWidgetStyle"/>
-    <genClasses ecoreClass="properties.ecore#//ReferenceWidgetStyle"/>
     <genClasses ecoreClass="properties.ecore#//ListWidgetStyle"/>
     <genClasses ecoreClass="properties.ecore#//HyperlinkWidgetStyle">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//HyperlinkWidgetStyle/fontNameExpression"/>
@@ -246,9 +236,6 @@
     <genClasses ecoreClass="properties.ecore#//CustomWidgetConditionalStyle">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CustomWidgetConditionalStyle/style"/>
     </genClasses>
-    <genClasses ecoreClass="properties.ecore#//ReferenceWidgetConditionalStyle">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//ReferenceWidgetConditionalStyle/style"/>
-    </genClasses>
     <genClasses ecoreClass="properties.ecore#//ListWidgetConditionalStyle">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//ListWidgetConditionalStyle/style"/>
     </genClasses>
diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
index ad3e917ec7..f420891081 100644
--- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
+++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
@@ -193,15 +193,6 @@ public interface PropertiesFactory extends EFactory {
     RadioDescription createRadioDescription();
 
     /**
-     * Returns a new object of class '<em>Reference Description</em>'. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @return a new object of class '<em>Reference Description</em>'.
-     * @generated
-     */
-    ReferenceDescription createReferenceDescription();
-
-    /**
      * Returns a new object of class '<em>List Description</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -328,15 +319,6 @@ public interface PropertiesFactory extends EFactory {
     CustomWidgetStyle createCustomWidgetStyle();
 
     /**
-     * Returns a new object of class '<em>Reference Widget Style</em>'. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @return a new object of class '<em>Reference Widget Style</em>'.
-     * @generated
-     */
-    ReferenceWidgetStyle createReferenceWidgetStyle();
-
-    /**
      * Returns a new object of class '<em>List Widget Style</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -428,17 +410,6 @@ public interface PropertiesFactory extends EFactory {
     CustomWidgetConditionalStyle createCustomWidgetConditionalStyle();
 
     /**
-     * Returns a new object of class '
-     * <em>Reference Widget Conditional Style</em>'. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     *
-     * @return a new object of class '
-     *         <em>Reference Widget Conditional Style</em>'.
-     * @generated
-     */
-    ReferenceWidgetConditionalStyle createReferenceWidgetConditionalStyle();
-
-    /**
      * Returns a new object of class '<em>List Widget Conditional Style</em>'.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
index 4af4cfcac2..7d8e626438 100644
--- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
+++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
@@ -1503,126 +1503,6 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@link org.eclipse.sirius.properties.impl.ReferenceDescriptionImpl
-     * <em>Reference Description</em>}' class. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @see org.eclipse.sirius.properties.impl.ReferenceDescriptionImpl
-     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getReferenceDescription()
-     * @generated
-     */
-    int REFERENCE_DESCRIPTION = 21;
-
-    /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int REFERENCE_DESCRIPTION__IDENTIFIER = PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER;
-
-    /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int REFERENCE_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.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 REFERENCE_DESCRIPTION__HELP_EXPRESSION = PropertiesPackage.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 REFERENCE_DESCRIPTION__IS_ENABLED_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION__IS_ENABLED_EXPRESSION;
-
-    /**
-     * The feature id for the '<em><b>Multiple</b></em>' attribute. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int REFERENCE_DESCRIPTION__MULTIPLE = PropertiesPackage.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 REFERENCE_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.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 REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>On Click Operation</b></em>' containment
-     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int REFERENCE_DESCRIPTION__ON_CLICK_OPERATION = PropertiesPackage.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 REFERENCE_DESCRIPTION__ACTIONS = PropertiesPackage.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 REFERENCE_DESCRIPTION__STYLE = PropertiesPackage.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 REFERENCE_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 6;
-
-    /**
-     * The number of structural features of the '<em>Reference Description</em>'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int REFERENCE_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 7;
-
-    /**
-     * The meta object id for the '
      * {@link org.eclipse.sirius.properties.impl.ListDescriptionImpl
      * <em>List Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -1631,7 +1511,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getListDescription()
      * @generated
      */
-    int LIST_DESCRIPTION = 22;
+    int LIST_DESCRIPTION = 21;
 
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
@@ -1742,7 +1622,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getOperationDescription()
      * @generated
      */
-    int OPERATION_DESCRIPTION = 23;
+    int OPERATION_DESCRIPTION = 22;
 
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment
@@ -1772,7 +1652,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomDescription()
      * @generated
      */
-    int CUSTOM_DESCRIPTION = 24;
+    int CUSTOM_DESCRIPTION = 23;
 
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
@@ -1865,7 +1745,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomExpression()
      * @generated
      */
-    int CUSTOM_EXPRESSION = 25;
+    int CUSTOM_EXPRESSION = 24;
 
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
@@ -1904,7 +1784,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomOperation()
      * @generated
      */
-    int CUSTOM_OPERATION = 26;
+    int CUSTOM_OPERATION = 25;
 
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
@@ -1943,7 +1823,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getHyperlinkDescription()
      * @generated
      */
-    int HYPERLINK_DESCRIPTION = 27;
+    int HYPERLINK_DESCRIPTION = 26;
 
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
@@ -2054,7 +1934,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getWidgetStyle()
      * @generated
      */
-    int WIDGET_STYLE = 28;
+    int WIDGET_STYLE = 27;
 
     /**
      * The feature id for the '<em><b>Label Font Name Expression</b></em>'
@@ -2120,7 +2000,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextWidgetStyle()
      * @generated
      */
-    int TEXT_WIDGET_STYLE = 29;
+    int TEXT_WIDGET_STYLE = 28;
 
     /**
      * The feature id for the '<em><b>Label Font Name Expression</b></em>'
@@ -2231,7 +2111,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getLabelWidgetStyle()
      * @generated
      */
-    int LABEL_WIDGET_STYLE = 30;
+    int LABEL_WIDGET_STYLE = 29;
 
     /**
      * The feature id for the '<em><b>Label Font Name Expression</b></em>'
@@ -2342,7 +2222,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCheckboxWidgetStyle()
      * @generated
      */
-    int CHECKBOX_WIDGET_STYLE = 31;
+    int CHECKBOX_WIDGET_STYLE = 30;
 
     /**
      * The feature id for the '<em><b>Label Font Name Expression</b></em>'
@@ -2408,7 +2288,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getRadioWidgetStyle()
      * @generated
      */
-    int RADIO_WIDGET_STYLE = 32;
+    int RADIO_WIDGET_STYLE = 31;
 
     /**
      * The feature id for the '<em><b>Label Font Name Expression</b></em>'
@@ -2474,7 +2354,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getButtonWidgetStyle()
      * @generated
      */
-    int BUTTON_WIDGET_STYLE = 33;
+    int BUTTON_WIDGET_STYLE = 32;
 
     /**
      * The feature id for the '<em><b>Label Font Name Expression</b></em>'
@@ -2540,7 +2420,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSelectWidgetStyle()
      * @generated
      */
-    int SELECT_WIDGET_STYLE = 34;
+    int SELECT_WIDGET_STYLE = 33;
 
     /**
      * The feature id for the '<em><b>Label Font Name Expression</b></em>'
@@ -2606,7 +2486,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomWidgetStyle()
      * @generated
      */
-    int CUSTOM_WIDGET_STYLE = 35;
+    int CUSTOM_WIDGET_STYLE = 34;
 
     /**
      * The feature id for the '<em><b>Label Font Name Expression</b></em>'
@@ -2672,7 +2552,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getWidgetConditionalStyle()
      * @generated
      */
-    int WIDGET_CONDITIONAL_STYLE = 40;
+    int WIDGET_CONDITIONAL_STYLE = 38;
 
     /**
      * The meta object id for the '
@@ -2684,7 +2564,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextWidgetConditionalStyle()
      * @generated
      */
-    int TEXT_WIDGET_CONDITIONAL_STYLE = 41;
+    int TEXT_WIDGET_CONDITIONAL_STYLE = 39;
 
     /**
      * The meta object id for the '
@@ -2696,7 +2576,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getLabelWidgetConditionalStyle()
      * @generated
      */
-    int LABEL_WIDGET_CONDITIONAL_STYLE = 42;
+    int LABEL_WIDGET_CONDITIONAL_STYLE = 40;
 
     /**
      * The meta object id for the '
@@ -2708,7 +2588,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCheckboxWidgetConditionalStyle()
      * @generated
      */
-    int CHECKBOX_WIDGET_CONDITIONAL_STYLE = 43;
+    int CHECKBOX_WIDGET_CONDITIONAL_STYLE = 41;
 
     /**
      * The meta object id for the '
@@ -2720,7 +2600,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getRadioWidgetConditionalStyle()
      * @generated
      */
-    int RADIO_WIDGET_CONDITIONAL_STYLE = 44;
+    int RADIO_WIDGET_CONDITIONAL_STYLE = 42;
 
     /**
      * The meta object id for the '
@@ -2732,7 +2612,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getButtonWidgetConditionalStyle()
      * @generated
      */
-    int BUTTON_WIDGET_CONDITIONAL_STYLE = 45;
+    int BUTTON_WIDGET_CONDITIONAL_STYLE = 43;
 
     /**
      * The meta object id for the '
@@ -2744,7 +2624,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSelectWidgetConditionalStyle()
      * @generated
      */
-    int SELECT_WIDGET_CONDITIONAL_STYLE = 46;
+    int SELECT_WIDGET_CONDITIONAL_STYLE = 44;
 
     /**
      * The meta object id for the '
@@ -2756,19 +2636,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomWidgetConditionalStyle()
      * @generated
      */
-    int CUSTOM_WIDGET_CONDITIONAL_STYLE = 47;
-
-    /**
-     * The meta object id for the '
-     * {@link org.eclipse.sirius.properties.impl.ReferenceWidgetConditionalStyleImpl
-     * <em>Reference Widget Conditional Style</em>}' class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     *
-     * @see org.eclipse.sirius.properties.impl.ReferenceWidgetConditionalStyleImpl
-     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getReferenceWidgetConditionalStyle()
-     * @generated
-     */
-    int REFERENCE_WIDGET_CONDITIONAL_STYLE = 48;
+    int CUSTOM_WIDGET_CONDITIONAL_STYLE = 45;
 
     /**
      * The meta object id for the '
@@ -2780,73 +2648,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getWidgetAction()
      * @generated
      */
-    int WIDGET_ACTION = 50;
-
-    /**
-     * The meta object id for the '
-     * {@link org.eclipse.sirius.properties.impl.ReferenceWidgetStyleImpl
-     * <em>Reference Widget Style</em>}' class. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @see org.eclipse.sirius.properties.impl.ReferenceWidgetStyleImpl
-     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getReferenceWidgetStyle()
-     * @generated
-     */
-    int REFERENCE_WIDGET_STYLE = 36;
-
-    /**
-     * The feature id for the '<em><b>Label Font Name Expression</b></em>'
-     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int REFERENCE_WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION = PropertiesPackage.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 REFERENCE_WIDGET_STYLE__LABEL_FONT_SIZE_EXPRESSION = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE_EXPRESSION;
-
-    /**
-     * The feature id for the '<em><b>Label Background Color</b></em>'
-     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int REFERENCE_WIDGET_STYLE__LABEL_BACKGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR;
-
-    /**
-     * The feature id for the '<em><b>Label Foreground Color</b></em>'
-     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int REFERENCE_WIDGET_STYLE__LABEL_FOREGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR;
-
-    /**
-     * The feature id for the '<em><b>Label Font Format</b></em>' attribute
-     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int REFERENCE_WIDGET_STYLE__LABEL_FONT_FORMAT = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT;
-
-    /**
-     * The number of structural features of the '<em>Reference Widget Style</em>
-     * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int REFERENCE_WIDGET_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 0;
+    int WIDGET_ACTION = 47;
 
     /**
      * The meta object id for the '
@@ -2858,7 +2660,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getListWidgetStyle()
      * @generated
      */
-    int LIST_WIDGET_STYLE = 37;
+    int LIST_WIDGET_STYLE = 35;
 
     /**
      * The feature id for the '<em><b>Label Font Name Expression</b></em>'
@@ -2924,7 +2726,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getHyperlinkWidgetStyle()
      * @generated
      */
-    int HYPERLINK_WIDGET_STYLE = 38;
+    int HYPERLINK_WIDGET_STYLE = 36;
 
     /**
      * The feature id for the '<em><b>Label Font Name Expression</b></em>'
@@ -3026,7 +2828,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getGroupStyle()
      * @generated
      */
-    int GROUP_STYLE = 39;
+    int GROUP_STYLE = 37;
 
     /**
      * The feature id for the '<em><b>Background Color</b></em>' reference. <!--
@@ -3316,34 +3118,6 @@ public interface PropertiesPackage extends EPackage {
     int CUSTOM_WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 1;
 
     /**
-     * The feature id for the '<em><b>Precondition Expression</b></em>'
-     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int REFERENCE_WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION = PropertiesPackage.WIDGET_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 REFERENCE_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 0;
-
-    /**
-     * The number of structural features of the '
-     * <em>Reference Widget Conditional Style</em>' class. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     *
-     * @generated
-     * @ordered
-     */
-    int REFERENCE_WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 1;
-
-    /**
      * The meta object id for the '
      * {@link org.eclipse.sirius.properties.impl.ListWidgetConditionalStyleImpl
      * <em>List Widget Conditional Style</em>}' class. <!-- begin-user-doc -->
@@ -3353,7 +3127,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getListWidgetConditionalStyle()
      * @generated
      */
-    int LIST_WIDGET_CONDITIONAL_STYLE = 49;
+    int LIST_WIDGET_CONDITIONAL_STYLE = 46;
 
     /**
      * The feature id for the '<em><b>Precondition Expression</b></em>'
@@ -3420,7 +3194,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getHyperlinkWidgetConditionalStyle()
      * @generated
      */
-    int HYPERLINK_WIDGET_CONDITIONAL_STYLE = 51;
+    int HYPERLINK_WIDGET_CONDITIONAL_STYLE = 48;
 
     /**
      * The feature id for the '<em><b>Precondition Expression</b></em>'
@@ -3460,7 +3234,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getGroupConditionalStyle()
      * @generated
      */
-    int GROUP_CONDITIONAL_STYLE = 52;
+    int GROUP_CONDITIONAL_STYLE = 49;
 
     /**
      * The feature id for the '<em><b>Precondition Expression</b></em>'
@@ -3500,7 +3274,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getFILL_LAYOUT_ORIENTATION()
      * @generated
      */
-    int FILL_LAYOUT_ORIENTATION = 53;
+    int FILL_LAYOUT_ORIENTATION = 50;
 
     /**
      * The meta object id for the '
@@ -3511,7 +3285,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getToggleStyle()
      * @generated
      */
-    int TOGGLE_STYLE = 54;
+    int TOGGLE_STYLE = 51;
 
     /**
      * The meta object id for the '
@@ -3523,7 +3297,7 @@ public interface PropertiesPackage extends EPackage {
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTitleBarStyle()
      * @generated
      */
-    int TITLE_BAR_STYLE = 55;
+    int TITLE_BAR_STYLE = 52;
 
     /**
      * Returns the meta object for class '
@@ -4683,109 +4457,6 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.properties.ReferenceDescription
-     * <em>Reference Description</em>}'. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @return the meta object for class '<em>Reference Description</em>'.
-     * @see org.eclipse.sirius.properties.ReferenceDescription
-     * @generated
-     */
-    EClass getReferenceDescription();
-
-    /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.properties.ReferenceDescription#isMultiple
-     * <em>Multiple</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @return the meta object for the attribute '<em>Multiple</em>'.
-     * @see org.eclipse.sirius.properties.ReferenceDescription#isMultiple()
-     * @see #getReferenceDescription()
-     * @generated
-     */
-    EAttribute getReferenceDescription_Multiple();
-
-    /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.properties.ReferenceDescription#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.sirius.properties.ReferenceDescription#getValueExpression()
-     * @see #getReferenceDescription()
-     * @generated
-     */
-    EAttribute getReferenceDescription_ValueExpression();
-
-    /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.properties.ReferenceDescription#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.sirius.properties.ReferenceDescription#getDisplayExpression()
-     * @see #getReferenceDescription()
-     * @generated
-     */
-    EAttribute getReferenceDescription_DisplayExpression();
-
-    /**
-     * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.properties.ReferenceDescription#getOnClickOperation
-     * <em>On Click Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     *
-     * @return the meta object for the containment reference '
-     *         <em>On Click Operation</em>'.
-     * @see org.eclipse.sirius.properties.ReferenceDescription#getOnClickOperation()
-     * @see #getReferenceDescription()
-     * @generated
-     */
-    EReference getReferenceDescription_OnClickOperation();
-
-    /**
-     * Returns the meta object for the containment reference list '
-     * {@link org.eclipse.sirius.properties.ReferenceDescription#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.sirius.properties.ReferenceDescription#getActions()
-     * @see #getReferenceDescription()
-     * @generated
-     */
-    EReference getReferenceDescription_Actions();
-
-    /**
-     * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.properties.ReferenceDescription#getStyle
-     * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @return the meta object for the containment reference '<em>Style</em>'.
-     * @see org.eclipse.sirius.properties.ReferenceDescription#getStyle()
-     * @see #getReferenceDescription()
-     * @generated
-     */
-    EReference getReferenceDescription_Style();
-
-    /**
-     * Returns the meta object for the containment reference list '
-     * {@link org.eclipse.sirius.properties.ReferenceDescription#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.sirius.properties.ReferenceDescription#getConditionalStyles()
-     * @see #getReferenceDescription()
-     * @generated
-     */
-    EReference getReferenceDescription_ConditionalStyles();
-
-    /**
-     * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.ListDescription
      * <em>List Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -5633,31 +5304,6 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle
-     * <em>Reference Widget Conditional Style</em>}'. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     *
-     * @return the meta object for class '
-     *         <em>Reference Widget Conditional Style</em>'.
-     * @see org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle
-     * @generated
-     */
-    EClass getReferenceWidgetConditionalStyle();
-
-    /**
-     * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle#getStyle
-     * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @return the meta object for the containment reference '<em>Style</em>'.
-     * @see org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle#getStyle()
-     * @see #getReferenceWidgetConditionalStyle()
-     * @generated
-     */
-    EReference getReferenceWidgetConditionalStyle_Style();
-
-    /**
-     * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.ListWidgetConditionalStyle
      * <em>List Widget Conditional Style</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
@@ -5770,18 +5416,6 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.properties.ReferenceWidgetStyle
-     * <em>Reference Widget Style</em>}'. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
-     * @return the meta object for class '<em>Reference Widget Style</em>'.
-     * @see org.eclipse.sirius.properties.ReferenceWidgetStyle
-     * @generated
-     */
-    EClass getReferenceWidgetStyle();
-
-    /**
-     * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.ListWidgetStyle
      * <em>List Widget Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
@@ -6852,76 +6486,6 @@ public interface PropertiesPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.properties.impl.ReferenceDescriptionImpl
-         * <em>Reference Description</em>}' class. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         *
-         * @see org.eclipse.sirius.properties.impl.ReferenceDescriptionImpl
-         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getReferenceDescription()
-         * @generated
-         */
-        EClass REFERENCE_DESCRIPTION = PropertiesPackage.eINSTANCE.getReferenceDescription();
-
-        /**
-         * The meta object literal for the '<em><b>Multiple</b></em>' attribute
-         * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
-         * @generated
-         */
-        EAttribute REFERENCE_DESCRIPTION__MULTIPLE = PropertiesPackage.eINSTANCE.getReferenceDescription_Multiple();
-
-        /**
-         * The meta object literal for the '<em><b>Value Expression</b></em>'
-         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
-         * @generated
-         */
-        EAttribute REFERENCE_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.eINSTANCE.getReferenceDescription_ValueExpression();
-
-        /**
-         * The meta object literal for the '<em><b>Display Expression</b></em>'
-         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
-         * @generated
-         */
-        EAttribute REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION = PropertiesPackage.eINSTANCE.getReferenceDescription_DisplayExpression();
-
-        /**
-         * The meta object literal for the '<em><b>On Click Operation</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         *
-         * @generated
-         */
-        EReference REFERENCE_DESCRIPTION__ON_CLICK_OPERATION = PropertiesPackage.eINSTANCE.getReferenceDescription_OnClickOperation();
-
-        /**
-         * The meta object literal for the '<em><b>Actions</b></em>' containment
-         * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
-         * @generated
-         */
-        EReference REFERENCE_DESCRIPTION__ACTIONS = PropertiesPackage.eINSTANCE.getReferenceDescription_Actions();
-
-        /**
-         * The meta object literal for the '<em><b>Style</b></em>' containment
-         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
-         * @generated
-         */
-        EReference REFERENCE_DESCRIPTION__STYLE = PropertiesPackage.eINSTANCE.getReferenceDescription_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 REFERENCE_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.eINSTANCE.getReferenceDescription_ConditionalStyles();
-
-        /**
-         * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.ListDescriptionImpl
          * <em>List Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
@@ -7552,26 +7116,6 @@ public interface PropertiesPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.properties.impl.ReferenceWidgetConditionalStyleImpl
-         * <em>Reference Widget Conditional Style</em>}' class. <!--
-         * begin-user-doc --> <!-- end-user-doc -->
-         *
-         * @see org.eclipse.sirius.properties.impl.ReferenceWidgetConditionalStyleImpl
-         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getReferenceWidgetConditionalStyle()
-         * @generated
-         */
-        EClass REFERENCE_WIDGET_CONDITIONAL_STYLE = PropertiesPackage.eINSTANCE.getReferenceWidgetConditionalStyle();
-
-        /**
-         * The meta object literal for the '<em><b>Style</b></em>' containment
-         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
-         * @generated
-         */
-        EReference REFERENCE_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.eINSTANCE.getReferenceWidgetConditionalStyle_Style();
-
-        /**
-         * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.ListWidgetConditionalStyleImpl
          * <em>List Widget Conditional Style</em>}' class. <!-- begin-user-doc
          * --> <!-- end-user-doc -->
@@ -7661,18 +7205,6 @@ public interface PropertiesPackage extends EPackage {
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.properties.impl.ReferenceWidgetStyleImpl
-         * <em>Reference Widget Style</em>}' class. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
-         *
-         * @see org.eclipse.sirius.properties.impl.ReferenceWidgetStyleImpl
-         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getReferenceWidgetStyle()
-         * @generated
-         */
-        EClass REFERENCE_WIDGET_STYLE = PropertiesPackage.eINSTANCE.getReferenceWidgetStyle();
-
-        /**
-         * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.ListWidgetStyleImpl
          * <em>List Widget Style</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ReferenceDescription.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ReferenceDescription.java
deleted file mode 100644
index 252b9f7625..0000000000
--- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ReferenceDescription.java
+++ /dev/null
@@ -1,233 +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.sirius.properties;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Reference Description</b></em>'. <!-- end-user-doc -->
- *
- * <!-- begin-model-doc --> Represents a reference in the user interface. <!--
- * end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- * <li>{@link org.eclipse.sirius.properties.ReferenceDescription#isMultiple
- * <em>Multiple</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.properties.ReferenceDescription#getValueExpression
- * <em>Value Expression</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.properties.ReferenceDescription#getDisplayExpression
- * <em>Display Expression</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.properties.ReferenceDescription#getOnClickOperation
- * <em>On Click Operation</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.ReferenceDescription#getActions
- * <em>Actions</em>}</li>
- * <li>{@link org.eclipse.sirius.properties.ReferenceDescription#getStyle
- * <em>Style</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.properties.ReferenceDescription#getConditionalStyles
- * <em>Conditional Styles</em>}</li>
- * </ul>
- *
- * @see org.eclipse.sirius.properties.PropertiesPackage#getReferenceDescription()
- * @model
- * @generated
- */
-public interface ReferenceDescription extends WidgetDescription {
-    /**
-     * Returns the value of the '<em><b>Multiple</b></em>' attribute. <!--
-     * begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Multiple</em>' attribute isn't clear, there
-     * really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     *
-     * @return the value of the '<em>Multiple</em>' attribute.
-     * @see #setMultiple(boolean)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getReferenceDescription_Multiple()
-     * @model
-     * @generated
-     */
-    boolean isMultiple();
-
-    /**
-     * Sets the value of the '
-     * {@link org.eclipse.sirius.properties.ReferenceDescription#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 -->
-     * The initial value. <!-- end-model-doc -->
-     *
-     * @return the value of the '<em>Value Expression</em>' attribute.
-     * @see #setValueExpression(String)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getReferenceDescription_ValueExpression()
-     * @model dataType=
-     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
-     * @generated
-     */
-    String getValueExpression();
-
-    /**
-     * Sets the value of the '
-     * {@link org.eclipse.sirius.properties.ReferenceDescription#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 -->
-     * Represents how to display the value. <!-- end-model-doc -->
-     *
-     * @return the value of the '<em>Display Expression</em>' attribute.
-     * @see #setDisplayExpression(String)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getReferenceDescription_DisplayExpression()
-     * @model dataType=
-     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
-     * @generated
-     */
-    String getDisplayExpression();
-
-    /**
-     * Sets the value of the '
-     * {@link org.eclipse.sirius.properties.ReferenceDescription#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 Operation</b></em>' containment
-     * reference. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
-     * begin-model-doc --> Defines the expected behavior when the user clicks on
-     * the hyperlink. <!-- end-model-doc -->
-     *
-     * @return the value of the '<em>On Click Operation</em>' containment
-     *         reference.
-     * @see #setOnClickOperation(OperationDescription)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getReferenceDescription_OnClickOperation()
-     * @model containment="true"
-     * @generated
-     */
-    InitialOperation getOnClickOperation();
-
-    /**
-     * Sets the value of the '
-     * {@link org.eclipse.sirius.properties.ReferenceDescription#getOnClickOperation
-     * <em>On Click Operation</em>}' containment reference. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     *
-     * @param value
-     *            the new value of the '<em>On Click Operation</em>' containment
-     *            reference.
-     * @see #getOnClickOperation()
-     * @generated
-     */
-    void setOnClickOperation(InitialOperation value);
-
-    /**
-     * Returns the value of the '<em><b>Actions</b></em>' containment reference
-     * list. The list contents are of type
-     * {@link org.eclipse.sirius.properties.WidgetAction}. <!-- begin-user-doc
-     * -->
-     * <p>
-     * If the meaning of the '<em>Actions</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>Actions</em>' containment reference list.
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getReferenceDescription_Actions()
-     * @model containment="true"
-     * @generated
-     */
-    EList<WidgetAction> getActions();
-
-    /**
-     * 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(ReferenceWidgetStyle)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getReferenceDescription_Style()
-     * @model containment="true"
-     * @generated
-     */
-    ReferenceWidgetStyle getStyle();
-
-    /**
-     * Sets the value of the '
-     * {@link org.eclipse.sirius.properties.ReferenceDescription#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(ReferenceWidgetStyle value);
-
-    /**
-     * Returns the value of the '<em><b>Conditional Styles</b></em>' containment
-     * reference list. The list contents are of type
-     * {@link org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Conditional Styles</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>Conditional Styles</em>' containment
-     *         reference list.
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getReferenceDescription_ConditionalStyles()
-     * @model containment="true"
-     * @generated
-     */
-    EList<ReferenceWidgetConditionalStyle> getConditionalStyles();
-
-} // ReferenceDescription
diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ReferenceWidgetConditionalStyle.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ReferenceWidgetConditionalStyle.java
deleted file mode 100644
index 755337ad89..0000000000
--- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ReferenceWidgetConditionalStyle.java
+++ /dev/null
@@ -1,62 +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.sirius.properties;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Reference Widget Conditional Style</b></em>'. <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- * <li>
- * {@link org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle#getStyle
- * <em>Style</em>}</li>
- * </ul>
- *
- * @see org.eclipse.sirius.properties.PropertiesPackage#getReferenceWidgetConditionalStyle()
- * @model
- * @generated
- */
-public interface ReferenceWidgetConditionalStyle extends WidgetConditionalStyle {
-    /**
-     * 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(ReferenceWidgetStyle)
-     * @see org.eclipse.sirius.properties.PropertiesPackage#getReferenceWidgetConditionalStyle_Style()
-     * @model containment="true"
-     * @generated
-     */
-    ReferenceWidgetStyle getStyle();
-
-    /**
-     * Sets the value of the '
-     * {@link org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle#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(ReferenceWidgetStyle value);
-
-} // ReferenceWidgetConditionalStyle
diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ReferenceWidgetStyle.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ReferenceWidgetStyle.java
deleted file mode 100644
index 852648a7e7..0000000000
--- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ReferenceWidgetStyle.java
+++ /dev/null
@@ -1,24 +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.sirius.properties;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Reference Widget Style</b></em>'. <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.sirius.properties.PropertiesPackage#getReferenceWidgetStyle()
- * @model
- * @generated
- */
-public interface ReferenceWidgetStyle extends WidgetStyle {
-} // ReferenceWidgetStyle
diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
index 1be45b690c..c1760ade30 100644
--- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
@@ -56,9 +56,6 @@ import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
 import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
 import org.eclipse.sirius.properties.RadioWidgetStyle;
-import org.eclipse.sirius.properties.ReferenceDescription;
-import org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle;
-import org.eclipse.sirius.properties.ReferenceWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
 import org.eclipse.sirius.properties.SelectWidgetStyle;
@@ -151,8 +148,6 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
             return createTextAreaDescription();
         case PropertiesPackage.RADIO_DESCRIPTION:
             return createRadioDescription();
-        case PropertiesPackage.REFERENCE_DESCRIPTION:
-            return createReferenceDescription();
         case PropertiesPackage.LIST_DESCRIPTION:
             return createListDescription();
         case PropertiesPackage.OPERATION_DESCRIPTION:
@@ -181,8 +176,6 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
             return createSelectWidgetStyle();
         case PropertiesPackage.CUSTOM_WIDGET_STYLE:
             return createCustomWidgetStyle();
-        case PropertiesPackage.REFERENCE_WIDGET_STYLE:
-            return createReferenceWidgetStyle();
         case PropertiesPackage.LIST_WIDGET_STYLE:
             return createListWidgetStyle();
         case PropertiesPackage.HYPERLINK_WIDGET_STYLE:
@@ -203,8 +196,6 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
             return createSelectWidgetConditionalStyle();
         case PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE:
             return createCustomWidgetConditionalStyle();
-        case PropertiesPackage.REFERENCE_WIDGET_CONDITIONAL_STYLE:
-            return createReferenceWidgetConditionalStyle();
         case PropertiesPackage.LIST_WIDGET_CONDITIONAL_STYLE:
             return createListWidgetConditionalStyle();
         case PropertiesPackage.WIDGET_ACTION:
@@ -460,17 +451,6 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * @generated
      */
     @Override
-    public ReferenceDescription createReferenceDescription() {
-        ReferenceDescriptionImpl referenceDescription = new ReferenceDescriptionImpl();
-        return referenceDescription;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
     public ListDescription createListDescription() {
         ListDescriptionImpl listDescription = new ListDescriptionImpl();
         return listDescription;
@@ -625,17 +605,6 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * @generated
      */
     @Override
-    public ReferenceWidgetStyle createReferenceWidgetStyle() {
-        ReferenceWidgetStyleImpl referenceWidgetStyle = new ReferenceWidgetStyleImpl();
-        return referenceWidgetStyle;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
     public ListWidgetStyle createListWidgetStyle() {
         ListWidgetStyleImpl listWidgetStyle = new ListWidgetStyleImpl();
         return listWidgetStyle;
@@ -746,17 +715,6 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * @generated
      */
     @Override
-    public ReferenceWidgetConditionalStyle createReferenceWidgetConditionalStyle() {
-        ReferenceWidgetConditionalStyleImpl referenceWidgetConditionalStyle = new ReferenceWidgetConditionalStyleImpl();
-        return referenceWidgetConditionalStyle;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
     public ListWidgetConditionalStyle createListWidgetConditionalStyle() {
         ListWidgetConditionalStyleImpl listWidgetConditionalStyle = new ListWidgetConditionalStyleImpl();
         return listWidgetConditionalStyle;
diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
index e4968f4db8..3a2669dbb0 100644
--- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
+++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
@@ -58,9 +58,6 @@ import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
 import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
 import org.eclipse.sirius.properties.RadioWidgetStyle;
-import org.eclipse.sirius.properties.ReferenceDescription;
-import org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle;
-import org.eclipse.sirius.properties.ReferenceWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
 import org.eclipse.sirius.properties.SelectWidgetStyle;
@@ -239,13 +236,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      *
      * @generated
      */
-    private EClass referenceDescriptionEClass = null;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
     private EClass listDescriptionEClass = null;
 
     /**
@@ -400,13 +390,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      *
      * @generated
      */
-    private EClass referenceWidgetConditionalStyleEClass = null;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
     private EClass listWidgetConditionalStyleEClass = null;
 
     /**
@@ -435,13 +418,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      *
      * @generated
      */
-    private EClass referenceWidgetStyleEClass = null;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
     private EClass listWidgetStyleEClass = null;
 
     /**
@@ -1454,86 +1430,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
-    public EClass getReferenceDescription() {
-        return referenceDescriptionEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public EAttribute getReferenceDescription_Multiple() {
-        return (EAttribute) referenceDescriptionEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public EAttribute getReferenceDescription_ValueExpression() {
-        return (EAttribute) referenceDescriptionEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public EAttribute getReferenceDescription_DisplayExpression() {
-        return (EAttribute) referenceDescriptionEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public EReference getReferenceDescription_OnClickOperation() {
-        return (EReference) referenceDescriptionEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public EReference getReferenceDescription_Actions() {
-        return (EReference) referenceDescriptionEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public EReference getReferenceDescription_Style() {
-        return (EReference) referenceDescriptionEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public EReference getReferenceDescription_ConditionalStyles() {
-        return (EReference) referenceDescriptionEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
     public EClass getListDescription() {
         return listDescriptionEClass;
     }
@@ -2194,26 +2090,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
-    public EClass getReferenceWidgetConditionalStyle() {
-        return referenceWidgetConditionalStyleEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public EReference getReferenceWidgetConditionalStyle_Style() {
-        return (EReference) referenceWidgetConditionalStyleEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
     public EClass getListWidgetConditionalStyle() {
         return listWidgetConditionalStyleEClass;
     }
@@ -2304,16 +2180,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
-    public EClass getReferenceWidgetStyle() {
-        return referenceWidgetStyleEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
     public EClass getListWidgetStyle() {
         return listWidgetStyleEClass;
     }
@@ -2620,15 +2486,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         createEAttribute(radioDescriptionEClass, PropertiesPackage.RADIO_DESCRIPTION__NUMBER_OF_COLUMNS);
         createEReference(radioDescriptionEClass, PropertiesPackage.RADIO_DESCRIPTION__CONDITIONAL_STYLES);
 
-        referenceDescriptionEClass = createEClass(PropertiesPackage.REFERENCE_DESCRIPTION);
-        createEAttribute(referenceDescriptionEClass, PropertiesPackage.REFERENCE_DESCRIPTION__MULTIPLE);
-        createEAttribute(referenceDescriptionEClass, PropertiesPackage.REFERENCE_DESCRIPTION__VALUE_EXPRESSION);
-        createEAttribute(referenceDescriptionEClass, PropertiesPackage.REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION);
-        createEReference(referenceDescriptionEClass, PropertiesPackage.REFERENCE_DESCRIPTION__ON_CLICK_OPERATION);
-        createEReference(referenceDescriptionEClass, PropertiesPackage.REFERENCE_DESCRIPTION__ACTIONS);
-        createEReference(referenceDescriptionEClass, PropertiesPackage.REFERENCE_DESCRIPTION__STYLE);
-        createEReference(referenceDescriptionEClass, PropertiesPackage.REFERENCE_DESCRIPTION__CONDITIONAL_STYLES);
-
         listDescriptionEClass = createEClass(PropertiesPackage.LIST_DESCRIPTION);
         createEAttribute(listDescriptionEClass, PropertiesPackage.LIST_DESCRIPTION__VALUE_EXPRESSION);
         createEAttribute(listDescriptionEClass, PropertiesPackage.LIST_DESCRIPTION__DISPLAY_EXPRESSION);
@@ -2693,8 +2550,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
         customWidgetStyleEClass = createEClass(PropertiesPackage.CUSTOM_WIDGET_STYLE);
 
-        referenceWidgetStyleEClass = createEClass(PropertiesPackage.REFERENCE_WIDGET_STYLE);
-
         listWidgetStyleEClass = createEClass(PropertiesPackage.LIST_WIDGET_STYLE);
 
         hyperlinkWidgetStyleEClass = createEClass(PropertiesPackage.HYPERLINK_WIDGET_STYLE);
@@ -2736,9 +2591,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         customWidgetConditionalStyleEClass = createEClass(PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE);
         createEReference(customWidgetConditionalStyleEClass, PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE);
 
-        referenceWidgetConditionalStyleEClass = createEClass(PropertiesPackage.REFERENCE_WIDGET_CONDITIONAL_STYLE);
-        createEReference(referenceWidgetConditionalStyleEClass, PropertiesPackage.REFERENCE_WIDGET_CONDITIONAL_STYLE__STYLE);
-
         listWidgetConditionalStyleEClass = createEClass(PropertiesPackage.LIST_WIDGET_CONDITIONAL_STYLE);
         createEReference(listWidgetConditionalStyleEClass, PropertiesPackage.LIST_WIDGET_CONDITIONAL_STYLE__STYLE);
 
@@ -2809,7 +2661,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         dynamicMappingForEClass.getESuperTypes().add(this.getControlDescription());
         textAreaDescriptionEClass.getESuperTypes().add(this.getTextDescription());
         radioDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
-        referenceDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
         listDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
         customDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
         hyperlinkDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
@@ -2820,7 +2671,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         buttonWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
         selectWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
         customWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
-        referenceWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
         listWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
         hyperlinkWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
         textWidgetConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
@@ -2830,7 +2680,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         buttonWidgetConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
         selectWidgetConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
         customWidgetConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
-        referenceWidgetConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
         listWidgetConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
         hyperlinkWidgetConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
         groupConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
@@ -3068,28 +2917,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
                 !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);
 
-        initEClass(referenceDescriptionEClass, ReferenceDescription.class, "ReferenceDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-        initEAttribute(getReferenceDescription_Multiple(), ecorePackage.getEBoolean(), "multiple", null, 0, 1, ReferenceDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getReferenceDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, ReferenceDescription.class, //$NON-NLS-1$
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEAttribute(getReferenceDescription_DisplayExpression(), theDescriptionPackage.getInterpretedExpression(), "displayExpression", null, 0, 1, ReferenceDescription.class, //$NON-NLS-1$
-                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getReferenceDescription_OnClickOperation(), theToolPackage.getInitialOperation(), null, "onClickOperation", null, 0, 1, ReferenceDescription.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
-                !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);
-        initEReference(getReferenceDescription_Actions(), this.getWidgetAction(), null, "actions", null, 0, -1, ReferenceDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getReferenceDescription_Style(), this.getReferenceWidgetStyle(), null, "style", null, 0, 1, ReferenceDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getReferenceDescription_ConditionalStyles(), this.getReferenceWidgetConditionalStyle(), null, "conditionalStyles", null, 0, -1, ReferenceDescription.class, //$NON-NLS-1$
-                !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);
-
         initEClass(listDescriptionEClass, ListDescription.class, "ListDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
         initEAttribute(getListDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, ListDescription.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
@@ -3212,8 +3039,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
         initEClass(customWidgetStyleEClass, CustomWidgetStyle.class, "CustomWidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-        initEClass(referenceWidgetStyleEClass, ReferenceWidgetStyle.class, "ReferenceWidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
         initEClass(listWidgetStyleEClass, ListWidgetStyle.class, "ListWidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
         initEClass(hyperlinkWidgetStyleEClass, HyperlinkWidgetStyle.class, "HyperlinkWidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
@@ -3295,12 +3120,6 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
                 !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);
 
-        initEClass(referenceWidgetConditionalStyleEClass, ReferenceWidgetConditionalStyle.class, "ReferenceWidgetConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, //$NON-NLS-1$
-                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getReferenceWidgetConditionalStyle_Style(), this.getReferenceWidgetStyle(), null, "style", null, 0, 1, ReferenceWidgetConditionalStyle.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
-                !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);
-
         initEClass(listWidgetConditionalStyleEClass, ListWidgetConditionalStyle.class, "ListWidgetConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, //$NON-NLS-1$
                 EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
         initEReference(getListWidgetConditionalStyle_Style(), this.getListWidgetStyle(), null, "style", null, 0, 1, ListWidgetConditionalStyle.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ReferenceDescriptionImpl.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ReferenceDescriptionImpl.java
deleted file mode 100644
index 1a40c829cb..0000000000
--- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ReferenceDescriptionImpl.java
+++ /dev/null
@@ -1,556 +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.sirius.properties.impl;
-
-import java.util.Collection;
-
-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;
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.properties.ReferenceDescription;
-import org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle;
-import org.eclipse.sirius.properties.ReferenceWidgetStyle;
-import org.eclipse.sirius.properties.WidgetAction;
-import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Reference Description</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- * <li>
- * {@link org.eclipse.sirius.properties.impl.ReferenceDescriptionImpl#isMultiple
- * <em>Multiple</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.properties.impl.ReferenceDescriptionImpl#getValueExpression
- * <em>Value Expression</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.properties.impl.ReferenceDescriptionImpl#getDisplayExpression
- * <em>Display Expression</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.properties.impl.ReferenceDescriptionImpl#getOnClickOperation
- * <em>On Click Operation</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.properties.impl.ReferenceDescriptionImpl#getActions
- * <em>Actions</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.properties.impl.ReferenceDescriptionImpl#getStyle
- * <em>Style</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.properties.impl.ReferenceDescriptionImpl#getConditionalStyles
- * <em>Conditional Styles</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class ReferenceDescriptionImpl extends WidgetDescriptionImpl implements ReferenceDescription {
-    /**
-     * 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 = ReferenceDescriptionImpl.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 = ReferenceDescriptionImpl.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 = ReferenceDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT;
-
-    /**
-     * The cached value of the '{@link #getOnClickOperation()
-     * <em>On Click Operation</em>}' containment reference. <!-- begin-user-doc
-     * --> <!-- end-user-doc -->
-     *
-     * @see #getOnClickOperation()
-     * @generated
-     * @ordered
-     */
-    protected InitialOperation onClickOperation;
-
-    /**
-     * 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<WidgetAction> actions;
-
-    /**
-     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
-     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @see #getStyle()
-     * @generated
-     * @ordered
-     */
-    protected ReferenceWidgetStyle 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<ReferenceWidgetConditionalStyle> conditionalStyles;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected ReferenceDescriptionImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    protected EClass eStaticClass() {
-        return PropertiesPackage.Literals.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, PropertiesPackage.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, PropertiesPackage.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, PropertiesPackage.REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION, oldDisplayExpression, displayExpression));
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public InitialOperation getOnClickOperation() {
-        return onClickOperation;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    public NotificationChain basicSetOnClickOperation(InitialOperation newOnClickOperation, NotificationChain msgs) {
-        InitialOperation oldOnClickOperation = onClickOperation;
-        onClickOperation = newOnClickOperation;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.REFERENCE_DESCRIPTION__ON_CLICK_OPERATION, oldOnClickOperation, newOnClickOperation);
-            if (msgs == null) {
-                msgs = notification;
-            } else {
-                msgs.add(notification);
-            }
-        }
-        return msgs;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public void setOnClickOperation(InitialOperation newOnClickOperation) {
-        if (newOnClickOperation != onClickOperation) {
-            NotificationChain msgs = null;
-            if (onClickOperation != null) {
-                msgs = ((InternalEObject) onClickOperation).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.REFERENCE_DESCRIPTION__ON_CLICK_OPERATION, null, msgs);
-            }
-            if (newOnClickOperation != null) {
-                msgs = ((InternalEObject) newOnClickOperation).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.REFERENCE_DESCRIPTION__ON_CLICK_OPERATION, null, msgs);
-            }
-            msgs = basicSetOnClickOperation(newOnClickOperation, msgs);
-            if (msgs != null) {
-                msgs.dispatch();
-            }
-        } else if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.REFERENCE_DESCRIPTION__ON_CLICK_OPERATION, newOnClickOperation, newOnClickOperation));
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public EList<WidgetAction> getActions() {
-        if (actions == null) {
-            actions = new EObjectContainmentEList<WidgetAction>(WidgetAction.class, this, PropertiesPackage.REFERENCE_DESCRIPTION__ACTIONS);
-        }
-        return actions;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public ReferenceWidgetStyle getStyle() {
-        return style;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    public NotificationChain basicSetStyle(ReferenceWidgetStyle newStyle, NotificationChain msgs) {
-        ReferenceWidgetStyle oldStyle = style;
-        style = newStyle;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.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(ReferenceWidgetStyle newStyle) {
-        if (newStyle != style) {
-            NotificationChain msgs = null;
-            if (style != null) {
-                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.REFERENCE_DESCRIPTION__STYLE, null, msgs);
-            }
-            if (newStyle != null) {
-                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.REFERENCE_DESCRIPTION__STYLE, null, msgs);
-            }
-            msgs = basicSetStyle(newStyle, msgs);
-            if (msgs != null) {
-                msgs.dispatch();
-            }
-        } else if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.REFERENCE_DESCRIPTION__STYLE, newStyle, newStyle));
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public EList<ReferenceWidgetConditionalStyle> getConditionalStyles() {
-        if (conditionalStyles == null) {
-            conditionalStyles = new EObjectContainmentEList<ReferenceWidgetConditionalStyle>(ReferenceWidgetConditionalStyle.class, this, PropertiesPackage.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 PropertiesPackage.REFERENCE_DESCRIPTION__ON_CLICK_OPERATION:
-            return basicSetOnClickOperation(null, msgs);
-        case PropertiesPackage.REFERENCE_DESCRIPTION__ACTIONS:
-            return ((InternalEList<?>) getActions()).basicRemove(otherEnd, msgs);
-        case PropertiesPackage.REFERENCE_DESCRIPTION__STYLE:
-            return basicSetStyle(null, msgs);
-        case PropertiesPackage.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 PropertiesPackage.REFERENCE_DESCRIPTION__MULTIPLE:
-            return isMultiple();
-        case PropertiesPackage.REFERENCE_DESCRIPTION__VALUE_EXPRESSION:
-            return getValueExpression();
-        case PropertiesPackage.REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION:
-            return getDisplayExpression();
-        case PropertiesPackage.REFERENCE_DESCRIPTION__ON_CLICK_OPERATION:
-            return getOnClickOperation();
-        case PropertiesPackage.REFERENCE_DESCRIPTION__ACTIONS:
-            return getActions();
-        case PropertiesPackage.REFERENCE_DESCRIPTION__STYLE:
-            return getStyle();
-        case PropertiesPackage.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 PropertiesPackage.REFERENCE_DESCRIPTION__MULTIPLE:
-            setMultiple((Boolean) newValue);
-            return;
-        case PropertiesPackage.REFERENCE_DESCRIPTION__VALUE_EXPRESSION:
-            setValueExpression((String) newValue);
-            return;
-        case PropertiesPackage.REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION:
-            setDisplayExpression((String) newValue);
-            return;
-        case PropertiesPackage.REFERENCE_DESCRIPTION__ON_CLICK_OPERATION:
-            setOnClickOperation((InitialOperation) newValue);
-            return;
-        case PropertiesPackage.REFERENCE_DESCRIPTION__ACTIONS:
-            getActions().clear();
-            getActions().addAll((Collection<? extends WidgetAction>) newValue);
-            return;
-        case PropertiesPackage.REFERENCE_DESCRIPTION__STYLE:
-            setStyle((ReferenceWidgetStyle) newValue);
-            return;
-        case PropertiesPackage.REFERENCE_DESCRIPTION__CONDITIONAL_STYLES:
-            getConditionalStyles().clear();
-            getConditionalStyles().addAll((Collection<? extends ReferenceWidgetConditionalStyle>) newValue);
-            return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-        case PropertiesPackage.REFERENCE_DESCRIPTION__MULTIPLE:
-            setMultiple(ReferenceDescriptionImpl.MULTIPLE_EDEFAULT);
-            return;
-        case PropertiesPackage.REFERENCE_DESCRIPTION__VALUE_EXPRESSION:
-            setValueExpression(ReferenceDescriptionImpl.VALUE_EXPRESSION_EDEFAULT);
-            return;
-        case PropertiesPackage.REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION:
-            setDisplayExpression(ReferenceDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT);
-            return;
-        case PropertiesPackage.REFERENCE_DESCRIPTION__ON_CLICK_OPERATION:
-            setOnClickOperation((InitialOperation) null);
-            return;
-        case PropertiesPackage.REFERENCE_DESCRIPTION__ACTIONS:
-            getActions().clear();
-            return;
-        case PropertiesPackage.REFERENCE_DESCRIPTION__STYLE:
-            setStyle((ReferenceWidgetStyle) null);
-            return;
-        case PropertiesPackage.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 PropertiesPackage.REFERENCE_DESCRIPTION__MULTIPLE:
-            return multiple != ReferenceDescriptionImpl.MULTIPLE_EDEFAULT;
-        case PropertiesPackage.REFERENCE_DESCRIPTION__VALUE_EXPRESSION:
-            return ReferenceDescriptionImpl.VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !ReferenceDescriptionImpl.VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
-        case PropertiesPackage.REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION:
-            return ReferenceDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT == null ? displayExpression != null : !ReferenceDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT.equals(displayExpression);
-        case PropertiesPackage.REFERENCE_DESCRIPTION__ON_CLICK_OPERATION:
-            return onClickOperation != null;
-        case PropertiesPackage.REFERENCE_DESCRIPTION__ACTIONS:
-            return actions != null && !actions.isEmpty();
-        case PropertiesPackage.REFERENCE_DESCRIPTION__STYLE:
-            return style != null;
-        case PropertiesPackage.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(')');
-        return result.toString();
-    }
-
-} // ReferenceDescriptionImpl
diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ReferenceWidgetConditionalStyleImpl.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ReferenceWidgetConditionalStyleImpl.java
deleted file mode 100644
index 90b1185804..0000000000
--- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ReferenceWidgetConditionalStyleImpl.java
+++ /dev/null
@@ -1,192 +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.sirius.properties.impl;
-
-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;
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle;
-import org.eclipse.sirius.properties.ReferenceWidgetStyle;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Reference Widget Conditional Style</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- * <li>
- * {@link org.eclipse.sirius.properties.impl.ReferenceWidgetConditionalStyleImpl#getStyle
- * <em>Style</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class ReferenceWidgetConditionalStyleImpl extends WidgetConditionalStyleImpl implements ReferenceWidgetConditionalStyle {
-    /**
-     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
-     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @see #getStyle()
-     * @generated
-     * @ordered
-     */
-    protected ReferenceWidgetStyle style;
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected ReferenceWidgetConditionalStyleImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    protected EClass eStaticClass() {
-        return PropertiesPackage.Literals.REFERENCE_WIDGET_CONDITIONAL_STYLE;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public ReferenceWidgetStyle getStyle() {
-        return style;
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    public NotificationChain basicSetStyle(ReferenceWidgetStyle newStyle, NotificationChain msgs) {
-        ReferenceWidgetStyle oldStyle = style;
-        style = newStyle;
-        if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.REFERENCE_WIDGET_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(ReferenceWidgetStyle newStyle) {
-        if (newStyle != style) {
-            NotificationChain msgs = null;
-            if (style != null) {
-                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.REFERENCE_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
-            }
-            if (newStyle != null) {
-                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.REFERENCE_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
-            }
-            msgs = basicSetStyle(newStyle, msgs);
-            if (msgs != null) {
-                msgs.dispatch();
-            }
-        } else if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.REFERENCE_WIDGET_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 PropertiesPackage.REFERENCE_WIDGET_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 PropertiesPackage.REFERENCE_WIDGET_CONDITIONAL_STYLE__STYLE:
-            return getStyle();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-        case PropertiesPackage.REFERENCE_WIDGET_CONDITIONAL_STYLE__STYLE:
-            setStyle((ReferenceWidgetStyle) newValue);
-            return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-        case PropertiesPackage.REFERENCE_WIDGET_CONDITIONAL_STYLE__STYLE:
-            setStyle((ReferenceWidgetStyle) null);
-            return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-        case PropertiesPackage.REFERENCE_WIDGET_CONDITIONAL_STYLE__STYLE:
-            return style != null;
-        }
-        return super.eIsSet(featureID);
-    }
-
-} // ReferenceWidgetConditionalStyleImpl
diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ReferenceWidgetStyleImpl.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ReferenceWidgetStyleImpl.java
deleted file mode 100644
index 089223639b..0000000000
--- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ReferenceWidgetStyleImpl.java
+++ /dev/null
@@ -1,44 +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.sirius.properties.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.properties.ReferenceWidgetStyle;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Reference Widget Style</b></em>'. <!-- end-user-doc -->
- *
- * @generated
- */
-public class ReferenceWidgetStyleImpl extends WidgetStyleImpl implements ReferenceWidgetStyle {
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected ReferenceWidgetStyleImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    protected EClass eStaticClass() {
-        return PropertiesPackage.Literals.REFERENCE_WIDGET_STYLE;
-    }
-
-} // ReferenceWidgetStyleImpl
diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
index 684ed33d12..9bc2444b16 100644
--- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
@@ -54,9 +54,6 @@ import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
 import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
 import org.eclipse.sirius.properties.RadioWidgetStyle;
-import org.eclipse.sirius.properties.ReferenceDescription;
-import org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle;
-import org.eclipse.sirius.properties.ReferenceWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
 import org.eclipse.sirius.properties.SelectWidgetStyle;
@@ -234,11 +231,6 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseReferenceDescription(ReferenceDescription object) {
-            return createReferenceDescriptionAdapter();
-        }
-
-        @Override
         public Adapter caseListDescription(ListDescription object) {
             return createListDescriptionAdapter();
         }
@@ -309,11 +301,6 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseReferenceWidgetStyle(ReferenceWidgetStyle object) {
-            return createReferenceWidgetStyleAdapter();
-        }
-
-        @Override
         public Adapter caseListWidgetStyle(ListWidgetStyle object) {
             return createListWidgetStyleAdapter();
         }
@@ -369,11 +356,6 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseReferenceWidgetConditionalStyle(ReferenceWidgetConditionalStyle object) {
-            return createReferenceWidgetConditionalStyleAdapter();
-        }
-
-        @Override
         public Adapter caseListWidgetConditionalStyle(ListWidgetConditionalStyle object) {
             return createListWidgetConditionalStyleAdapter();
         }
@@ -766,22 +748,6 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.properties.ReferenceDescription
-     * <em>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.sirius.properties.ReferenceDescription
-     * @generated
-     */
-    public Adapter createReferenceDescriptionAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '
      * {@link org.eclipse.sirius.properties.ListDescription
      * <em>List Description</em>}'. <!-- begin-user-doc --> This default
      * implementation returns null so that we can easily ignore cases; it's
@@ -1005,22 +971,6 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.properties.ReferenceWidgetStyle
-     * <em>Reference Widget 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.sirius.properties.ReferenceWidgetStyle
-     * @generated
-     */
-    public Adapter createReferenceWidgetStyleAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '
      * {@link org.eclipse.sirius.properties.ListWidgetStyle
      * <em>List Widget Style</em>}'. <!-- begin-user-doc --> This default
      * implementation returns null so that we can easily ignore cases; it's
@@ -1196,22 +1146,6 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle
-     * <em>Reference Widget 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.sirius.properties.ReferenceWidgetConditionalStyle
-     * @generated
-     */
-    public Adapter createReferenceWidgetConditionalStyleAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '
      * {@link org.eclipse.sirius.properties.ListWidgetConditionalStyle
      * <em>List Widget Conditional Style</em>}'. <!-- begin-user-doc --> This
      * default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
index 1d08886f6e..1da6d151e6 100644
--- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
+++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
@@ -54,9 +54,6 @@ import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
 import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
 import org.eclipse.sirius.properties.RadioWidgetStyle;
-import org.eclipse.sirius.properties.ReferenceDescription;
-import org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle;
-import org.eclipse.sirius.properties.ReferenceWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
 import org.eclipse.sirius.properties.SelectWidgetStyle;
@@ -383,20 +380,6 @@ public class PropertiesSwitch<T> {
             }
             return result;
         }
-        case PropertiesPackage.REFERENCE_DESCRIPTION: {
-            ReferenceDescription referenceDescription = (ReferenceDescription) theEObject;
-            T result = caseReferenceDescription(referenceDescription);
-            if (result == null) {
-                result = caseWidgetDescription(referenceDescription);
-            }
-            if (result == null) {
-                result = caseControlDescription(referenceDescription);
-            }
-            if (result == null) {
-                result = defaultCase(theEObject);
-            }
-            return result;
-        }
         case PropertiesPackage.LIST_DESCRIPTION: {
             ListDescription listDescription = (ListDescription) theEObject;
             T result = caseListDescription(listDescription);
@@ -548,17 +531,6 @@ public class PropertiesSwitch<T> {
             }
             return result;
         }
-        case PropertiesPackage.REFERENCE_WIDGET_STYLE: {
-            ReferenceWidgetStyle referenceWidgetStyle = (ReferenceWidgetStyle) theEObject;
-            T result = caseReferenceWidgetStyle(referenceWidgetStyle);
-            if (result == null) {
-                result = caseWidgetStyle(referenceWidgetStyle);
-            }
-            if (result == null) {
-                result = defaultCase(theEObject);
-            }
-            return result;
-        }
         case PropertiesPackage.LIST_WIDGET_STYLE: {
             ListWidgetStyle listWidgetStyle = (ListWidgetStyle) theEObject;
             T result = caseListWidgetStyle(listWidgetStyle);
@@ -674,17 +646,6 @@ public class PropertiesSwitch<T> {
             }
             return result;
         }
-        case PropertiesPackage.REFERENCE_WIDGET_CONDITIONAL_STYLE: {
-            ReferenceWidgetConditionalStyle referenceWidgetConditionalStyle = (ReferenceWidgetConditionalStyle) theEObject;
-            T result = caseReferenceWidgetConditionalStyle(referenceWidgetConditionalStyle);
-            if (result == null) {
-                result = caseWidgetConditionalStyle(referenceWidgetConditionalStyle);
-            }
-            if (result == null) {
-                result = defaultCase(theEObject);
-            }
-            return result;
-        }
         case PropertiesPackage.LIST_WIDGET_CONDITIONAL_STYLE: {
             ListWidgetConditionalStyle listWidgetConditionalStyle = (ListWidgetConditionalStyle) theEObject;
             T result = caseListWidgetConditionalStyle(listWidgetConditionalStyle);
@@ -1090,23 +1051,6 @@ public class PropertiesSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
-     * <em>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>Reference Description</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseReferenceDescription(ReferenceDescription object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '
      * <em>List Description</em>'. <!-- begin-user-doc --> This implementation
      * returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
@@ -1345,23 +1289,6 @@ public class PropertiesSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
-     * <em>Reference Widget 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>Reference Widget Style</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseReferenceWidgetStyle(ReferenceWidgetStyle object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '
      * <em>List Widget Style</em>'. <!-- begin-user-doc --> This implementation
      * returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
@@ -1549,23 +1476,6 @@ public class PropertiesSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
-     * <em>Reference Widget 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>Reference Widget Conditional Style</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseReferenceWidgetConditionalStyle(ReferenceWidgetConditionalStyle object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '
      * <em>List Widget 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.sirius.tests.ui.properties/data/eef.xmi b/plugins/org.eclipse.sirius.tests.ui.properties/data/eef.xmi
index 7f91bdc740..b4cdf92dcb 100644
--- a/plugins/org.eclipse.sirius.tests.ui.properties/data/eef.xmi
+++ b/plugins/org.eclipse.sirius.tests.ui.properties/data/eef.xmi
@@ -14,7 +14,7 @@
         labelExpression="Name:"
         helpExpression="The name of the current object"
         valueExpression="aql:self.name"
-        editExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@groups.0/@controls.0/@initialOperation')">
+        editExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@groups.0/@controls.0/@initialOperation')">
       <style
           backgroundColorExpression="rgb(0,0,0)"
           foregroundColorExpression="rgb(255,255,255)"
@@ -37,8 +37,7 @@
       <conditionalStyles
           preconditionExpression="aql:true">
         <style
-            fontNameExpression="helvetica"
-            fontSizeExpression=""/>
+            fontNameExpression="helvetica"/>
       </conditionalStyles>
     </controls>
     <controls
@@ -46,12 +45,12 @@
         labelExpression="Description:"
         helpExpression="The description of the current object"
         valueExpression="aql:self.description"
-        editExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@groups.0/@controls.2/@initialOperation')"
+        editExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@groups.0/@controls.2/@initialOperation')"
         lineCount="5"/>
     <controls
         xsi:type="eef:EEFButtonDescription"
         buttonLabelExpression="OK"
-        pushExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@groups.0/@controls.3/@initialOperation')">
+        pushExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@groups.0/@controls.3/@initialOperation')">
       <style
           labelFontNameExpression="arial"/>
       <conditionalStyles
@@ -64,7 +63,7 @@
         xsi:type="eef:EEFRadioDescription"
         labelExpression="Status:"
         valueExpression="aql:self.status"
-        editExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@groups.0/@controls.4/@initialOperation')"
+        editExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@groups.0/@controls.4/@initialOperation')"
         candidatesExpression="Sequence{'Active', 'Inactive'}"
         candidateDisplayExpression="aql:candidate.toString()"
         numberOfColumns="2"/>
@@ -72,37 +71,34 @@
         xsi:type="eef:EEFHyperlinkDescription"
         labelExpression=""
         valueExpression="Click Me!"
-        onClickExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@groups.0/@controls.5/@initialOperation')"/>
+        onClickExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@groups.0/@controls.5/@initialOperation')"/>
     <controls
-        xsi:type="eef:EEFReferenceDescription"
+        xsi:type="eef:EEFListDescription"
         labelExpression="Reference:"
         helpExpression="The reference"
         isEnabledExpression="aql:true"
-        multiple="true"
         valueExpression="aql:self.reference"
         displayExpression="aql:value.toString()"
-        onClickExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@groups.0/@controls.6/@onClickOperation')">
+        onClickExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@groups.0/@controls.6/@onClickOperation')">
       <actions
           labelExpression="Add"
-          actionExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@groups.0/@controls.6/@actions.0/@initialOperation')"/>
+          actionExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@groups.0/@controls.6/@actions.0/@initialOperation')"/>
       <actions
           labelExpression="Remove"
-          actionExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@groups.0/@controls.6/@actions.1/@initialOperation')"/>
+          actionExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@groups.0/@controls.6/@actions.1/@initialOperation')"/>
     </controls>
     <controls
         xsi:type="eef:EEFSelectDescription"
         labelExpression="Values:"
         valueExpression="aql:self.values"
-        editExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@groups.0/@controls.7/@initialOperation')"
+        editExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@groups.0/@controls.7/@initialOperation')"
         candidatesExpression="aql:package::Value.eAllInstances()"
         candidateDisplayExpression="aql:candidate.toString()"/>
-    <style backgroundColorExpression="rgb(255,255,255)"
-        fontSizeExpression="0"/>
+    <style backgroundColorExpression="rgb(255,255,255)"/>
     <conditionalStyles
         preconditionExpression="aql:true">
       <style
-          backgroundColorExpression="rgb(0,0,0)"
-          fontSizeExpression="0"/>
+          backgroundColorExpression="rgb(0,0,0)"/>
     </conditionalStyles>
   </groups>
   <groups identifier="details"
@@ -112,20 +108,20 @@
         labelExpression="Reference Identifier:"
         helpExpression="The identifier of the reference"
         valueExpression="aql:self.referenceIdentifier"
-        editExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@groups.1/@controls.0/@initialOperation')"/>
+        editExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@groups.1/@controls.0/@initialOperation')"/>
     <controls
         xsi:type="eef:EEFContainerDescription">
       <controls
           xsi:type="eef:EEFDynamicMappingFor"
           iterator="visibility"
-          domainClassExpression="aql:Sequence{'public', 'private', 'protected', 'package'}">
+          iterableExpression="aql:Sequence{'public', 'private', 'protected', 'package'}">
         <ifs
             predicateExpression="aql:true">
           <widget
               xsi:type="eef:EEFCheckboxDescription"
               labelExpression="aql:visibility.toUpperFirst() + ':'"
               valueExpression="aql:self.visibility"
-              editExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@groups.1/@controls.1/@controls.0/@ifs.0/@widget/@initialOperation')">
+              editExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@groups.1/@controls.1/@controls.0/@ifs.0/@widget/@initialOperation')">
             <style
                 labelBackgroundColorExpression="rgb(0,0,0)"
                 labelForegroundColorExpression="rgb(255,255,255)"/>
@@ -143,10 +139,10 @@
       <customExpressions
           customExpression="aql:self.doSomething()"/>
       <customExpressions
-          customExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@groups.1/@controls.2/@customOperations.0/@initialOperation')"/>
+          customExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@groups.1/@controls.2/@customOperations.0/@initialOperation')"/>
     </controls>
   </groups>
-  <groups identifier="/data/sirius.xmi#/0/@groups.2"
+  <groups identifier="/data/sirius.odesign#/0/@groups.2"
       labelExpression="Feedback">
     <controls
         xsi:type="eef:EEFContainerDescription">
@@ -157,7 +153,7 @@
             labelExpression="Advantages:"
             helpExpression="The advantages of the current object"
             valueExpression="aql:self.advantages"
-            editExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@groups.2/@controls.0/@controls.0/@controls.0/@initialOperation')"
+            editExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@groups.2/@controls.0/@controls.0/@controls.0/@initialOperation')"
             lineCount="5"/>
         <layout
             xsi:type="eef:EEFFillLayoutDescription"/>
@@ -169,7 +165,7 @@
             labelExpression="Drawbacks:"
             helpExpression="The drawbacks of the current object"
             valueExpression="aql:self.drawbacks"
-            editExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@groups.2/@controls.0/@controls.1/@controls.0/@initialOperation')"
+            editExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@groups.2/@controls.0/@controls.1/@controls.0/@initialOperation')"
             lineCount="5"/>
         <layout
             xsi:type="eef:EEFFillLayoutDescription"/>
@@ -189,7 +185,7 @@
           auditExpression="aql:false"/>
       <fixes
           name="Fix length"
-          fixExpression="aql:self.executeOperation('/data/sirius.xmi#/0/@pages.0/@validationSet/@semanticValidationRules.0/@fixes.0/@initialOperation')"/>
+          fixExpression="aql:self.executeOperation('/data/sirius.odesign#/0/@pages.0/@validationSet/@semanticValidationRules.0/@fixes.0/@initialOperation')"/>
     </semanticValidationRules>
   </pages>
   <pages identifier="properties"
diff --git a/plugins/org.eclipse.sirius.tests.ui.properties/data/migration/after_reference.odesign b/plugins/org.eclipse.sirius.tests.ui.properties/data/migration/after_reference.odesign
new file mode 100644
index 0000000000..a057150539
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.ui.properties/data/migration/after_reference.odesign
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<description:Group
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:description="http://www.eclipse.org/sirius/description/1.1.0"
+    xmlns:properties="http://www.eclipse.org/sirius/properties/1.0.0"
+    xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0"
+    name="basicfamily"
+    version="11.0.0.201609021200">
+  <extensions
+      xsi:type="properties:ViewExtensionDescription"
+      identifier="NewPropertieView">
+    <metamodels
+        href="http://www.eclipse.org/sirius/sample/basicfamily#/"/>
+    <pages identifier="PropertiesTabGeneralForFamily"
+        labelExpression="General"
+        domainClass="basicfamily.Family"
+        groups="//@extensions.0/@groups.0"/>
+    <groups
+        identifier="Family Text"
+        labelExpression="Text"
+        domainClass="basicfamily.Family">
+      <controls
+          xsi:type="properties:LabelDescription"
+          identifier="Single Label Reference Identifier"
+          labelExpression="Single Label Reference Label Expression"
+          helpExpression="Single Label Reference Help Expression"
+          isEnabledExpression="aql:true"
+          displayExpression="Single Label Reference Display Expression"
+          valueExpression="Single Label Reference Value Expression">
+        <style
+            labelFontNameExpression="Label Font Name Expression"
+            labelFontSizeExpression="12">
+          <labelBackgroundColor
+              xsi:type="description:SystemColor"
+              href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+          <labelForegroundColor
+              xsi:type="description:SystemColor"
+              href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+          <labelFontFormat>strike_through</labelFontFormat>
+          <labelFontFormat>bold</labelFontFormat>
+        </style>
+        <conditionalStyles
+            preconditionExpression="aql:true">
+          <style
+              labelFontNameExpression="Label Font Name Expression True"
+              labelFontSizeExpression="12">
+            <labelBackgroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            <labelForegroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            <labelFontFormat>strike_through</labelFontFormat>
+            <labelFontFormat>bold</labelFontFormat>
+          </style>
+        </conditionalStyles>
+        <conditionalStyles
+            preconditionExpression="aql:false">
+          <style
+              labelFontNameExpression="Label Font Name Expression False"
+              labelFontSizeExpression="12">
+            <labelBackgroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            <labelForegroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            <labelFontFormat>strike_through</labelFontFormat>
+            <labelFontFormat>bold</labelFontFormat>
+          </style>
+        </conditionalStyles>
+        <actions
+            labelExpression="OK">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool:ChangeContext"
+                browseExpression="OKExpression"/>
+          </initialOperation>
+        </actions>
+        <actions
+            labelExpression="Cancel">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool:ChangeContext"
+                browseExpression="CancelExpression"/>
+          </initialOperation>
+        </actions>
+        <actions
+            labelExpression="Default">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool:ChangeContext"
+                browseExpression="DefaultExpression"/>
+          </initialOperation>
+        </actions>
+      </controls>
+      <controls
+          xsi:type="properties:HyperlinkDescription"
+          identifier="Single Hyperlink Reference Identifier"
+          labelExpression="Single Hyperlink Reference Label Expression"
+          helpExpression="Single Hyperlink Reference Help Expression"
+          isEnabledExpression="aql:true"
+          valueExpression="Single Hyperlink Reference Value Expression"
+          displayExpression="Single Hyperlink Reference Display Expression">
+        <initialOperation>
+          <firstModelOperations
+              xsi:type="tool:ChangeContext"
+              browseExpression="onClickExpression"/>
+        </initialOperation>
+        <style
+            labelFontNameExpression="Label Font Name Expression"
+            labelFontSizeExpression="12">
+          <labelBackgroundColor
+              xsi:type="description:SystemColor"
+              href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+          <labelForegroundColor
+              xsi:type="description:SystemColor"
+              href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+          <labelFontFormat>strike_through</labelFontFormat>
+          <labelFontFormat>bold</labelFontFormat>
+        </style>
+        <conditionalStyles
+            preconditionExpression="aql:true">
+          <style
+              labelFontNameExpression="Label Font Name Expression True"
+              labelFontSizeExpression="12">
+            <labelBackgroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            <labelForegroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            <labelFontFormat>strike_through</labelFontFormat>
+            <labelFontFormat>bold</labelFontFormat>
+          </style>
+        </conditionalStyles>
+        <conditionalStyles
+            preconditionExpression="aql:false">
+          <style
+              labelFontNameExpression="Label Font Name Expression False"
+              labelFontSizeExpression="12">
+            <labelBackgroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            <labelForegroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            <labelFontFormat>strike_through</labelFontFormat>
+            <labelFontFormat>bold</labelFontFormat>
+          </style>
+        </conditionalStyles>
+        <actions
+            labelExpression="OK">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool:ChangeContext"
+                browseExpression="OKExpression"/>
+          </initialOperation>
+        </actions>
+        <actions
+            labelExpression="Cancel">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool:ChangeContext"
+                browseExpression="CancelExpression"/>
+          </initialOperation>
+        </actions>
+        <actions
+            labelExpression="Default">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool:ChangeContext"
+                browseExpression="DefaultExpression"/>
+          </initialOperation>
+        </actions>
+      </controls>
+      <controls
+          xsi:type="properties:ListDescription"
+          identifier="Single List Reference Identifier"
+          labelExpression="Single List Reference Label Expression"
+          helpExpression="Single List Reference Help Expression"
+          isEnabledExpression="aql:true"
+          valueExpression="Single List Reference Value Expression"
+          displayExpression="Single List Reference Display Expression">
+        <onClickOperation>
+          <firstModelOperations
+              xsi:type="tool:ChangeContext"
+              browseExpression="onClickExpression"/>
+        </onClickOperation>
+        <actions
+            labelExpression="OK">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool:ChangeContext"
+                browseExpression="OKExpression"/>
+          </initialOperation>
+        </actions>
+        <actions
+            labelExpression="Cancel">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool:ChangeContext"
+                browseExpression="CancelExpression"/>
+          </initialOperation>
+        </actions>
+        <actions
+            labelExpression="Default">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool:ChangeContext"
+                browseExpression="DefaultExpression"/>
+          </initialOperation>
+        </actions>
+        <style
+            labelFontNameExpression="Label Font Name Expression"
+            labelFontSizeExpression="12">
+          <labelBackgroundColor
+              xsi:type="description:SystemColor"
+              href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+          <labelForegroundColor
+              xsi:type="description:SystemColor"
+              href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+          <labelFontFormat>strike_through</labelFontFormat>
+          <labelFontFormat>bold</labelFontFormat>
+        </style>
+        <conditionalStyles
+            preconditionExpression="aql:true">
+          <style
+              labelFontNameExpression="Label Font Name Expression True"
+              labelFontSizeExpression="12">
+            <labelBackgroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            <labelForegroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            <labelFontFormat>strike_through</labelFontFormat>
+            <labelFontFormat>bold</labelFontFormat>
+          </style>
+        </conditionalStyles>
+        <conditionalStyles
+            preconditionExpression="aql:false">
+          <style
+              labelFontNameExpression="Label Font Name Expression False"
+              labelFontSizeExpression="12">
+            <labelBackgroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            <labelForegroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            <labelFontFormat>strike_through</labelFontFormat>
+            <labelFontFormat>bold</labelFontFormat>
+          </style>
+        </conditionalStyles>
+      </controls>
+    </groups>
+  </extensions>
+</description:Group>
diff --git a/plugins/org.eclipse.sirius.tests.ui.properties/data/migration/before_reference.odesign b/plugins/org.eclipse.sirius.tests.ui.properties/data/migration/before_reference.odesign
new file mode 100644
index 0000000000..dcdd1bd37b
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.ui.properties/data/migration/before_reference.odesign
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<description:Group
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:description="http://www.eclipse.org/sirius/description/1.1.0"
+    xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0"
+    xmlns:properties="http://www.eclipse.org/sirius/properties/1.0.0"
+    xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"
+    xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0"
+    xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0"
+    name="basicfamily"
+    version="11.0.0.201608291200">
+  <extensions
+      xsi:type="properties:ViewExtensionDescription"
+      identifier="NewPropertieView">
+    <metamodels
+        href="http://www.eclipse.org/sirius/sample/basicfamily#/"/>
+    <pages identifier="PropertiesTabGeneralForFamily"
+        labelExpression="General"
+        domainClass="basicfamily.Family"
+        groups="//@extensions.0/@groups.0"/>
+    <groups
+        identifier="Family Text"
+        labelExpression="Text"
+        domainClass="basicfamily.Family">
+      <controls
+          xsi:type="properties:ReferenceDescription"
+          identifier="Single Label Reference Identifier"
+          labelExpression="Single Label Reference Label Expression"
+          helpExpression="Single Label Reference Help Expression"
+          isEnabledExpression="aql:true"
+          valueExpression="Single Label Reference Value Expression"
+          displayExpression="Single Label Reference Display Expression">
+        <actions
+            labelExpression="OK">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool_1:ChangeContext"
+                browseExpression="OKExpression"/>
+          </initialOperation>
+        </actions>
+        <actions
+            labelExpression="Cancel">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool_1:ChangeContext"
+                browseExpression="CancelExpression"/>
+          </initialOperation>
+        </actions>
+        <actions
+            labelExpression="Default">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool_1:ChangeContext"
+                browseExpression="DefaultExpression"/>
+          </initialOperation>
+        </actions>
+        <style
+            labelFontNameExpression="Label Font Name Expression"
+            labelFontSize="12">
+          <labelBackgroundColor
+              xsi:type="description:SystemColor"
+              href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+          <labelForegroundColor
+              xsi:type="description:SystemColor"
+              href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+          <labelFontFormat>strike_through</labelFontFormat>
+          <labelFontFormat>bold</labelFontFormat>
+        </style>
+        <conditionalStyles
+            preconditionExpression="aql:true">
+          <style
+              labelFontNameExpression="Label Font Name Expression True"
+              labelFontSize="12">
+            <labelBackgroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            <labelForegroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            <labelFontFormat>strike_through</labelFontFormat>
+            <labelFontFormat>bold</labelFontFormat>
+          </style>
+        </conditionalStyles>
+        <conditionalStyles
+            preconditionExpression="aql:false">
+          <style
+              labelFontNameExpression="Label Font Name Expression False"
+              labelFontSize="12">
+            <labelBackgroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            <labelForegroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            <labelFontFormat>strike_through</labelFontFormat>
+            <labelFontFormat>bold</labelFontFormat>
+          </style>
+        </conditionalStyles>
+      </controls>
+      <controls
+          xsi:type="properties:ReferenceDescription"
+          identifier="Single Hyperlink Reference Identifier"
+          labelExpression="Single Hyperlink Reference Label Expression"
+          helpExpression="Single Hyperlink Reference Help Expression"
+          isEnabledExpression="aql:true"
+          valueExpression="Single Hyperlink Reference Value Expression"
+          displayExpression="Single Hyperlink Reference Display Expression">
+        <onClickOperation>
+          <firstModelOperations
+              xsi:type="tool_1:ChangeContext"
+              browseExpression="onClickExpression"/>
+        </onClickOperation>
+        <actions
+            labelExpression="OK">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool_1:ChangeContext"
+                browseExpression="OKExpression"/>
+          </initialOperation>
+        </actions>
+        <actions
+            labelExpression="Cancel">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool_1:ChangeContext"
+                browseExpression="CancelExpression"/>
+          </initialOperation>
+        </actions>
+        <actions
+            labelExpression="Default">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool_1:ChangeContext"
+                browseExpression="DefaultExpression"/>
+          </initialOperation>
+        </actions>
+        <style
+            labelFontNameExpression="Label Font Name Expression"
+            labelFontSize="12">
+          <labelBackgroundColor
+              xsi:type="description:SystemColor"
+              href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+          <labelForegroundColor
+              xsi:type="description:SystemColor"
+              href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+          <labelFontFormat>strike_through</labelFontFormat>
+          <labelFontFormat>bold</labelFontFormat>
+        </style>
+        <conditionalStyles
+            preconditionExpression="aql:true">
+          <style
+              labelFontNameExpression="Label Font Name Expression True"
+              labelFontSize="12">
+            <labelBackgroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            <labelForegroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            <labelFontFormat>strike_through</labelFontFormat>
+            <labelFontFormat>bold</labelFontFormat>
+          </style>
+        </conditionalStyles>
+        <conditionalStyles
+            preconditionExpression="aql:false">
+          <style
+              labelFontNameExpression="Label Font Name Expression False"
+              labelFontSize="12">
+            <labelBackgroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            <labelForegroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            <labelFontFormat>strike_through</labelFontFormat>
+            <labelFontFormat>bold</labelFontFormat>
+          </style>
+        </conditionalStyles>
+      </controls>
+      <controls
+          xsi:type="properties:ReferenceDescription"
+          identifier="Single List Reference Identifier"
+          labelExpression="Single List Reference Label Expression"
+          helpExpression="Single List Reference Help Expression"
+          isEnabledExpression="aql:true"
+          multiple="true"
+          valueExpression="Single List Reference Value Expression"
+          displayExpression="Single List Reference Display Expression">
+        <onClickOperation>
+          <firstModelOperations
+              xsi:type="tool_1:ChangeContext"
+              browseExpression="onClickExpression"/>
+        </onClickOperation>
+        <actions
+            labelExpression="OK">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool_1:ChangeContext"
+                browseExpression="OKExpression"/>
+          </initialOperation>
+        </actions>
+        <actions
+            labelExpression="Cancel">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool_1:ChangeContext"
+                browseExpression="CancelExpression"/>
+          </initialOperation>
+        </actions>
+        <actions
+            labelExpression="Default">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool_1:ChangeContext"
+                browseExpression="DefaultExpression"/>
+          </initialOperation>
+        </actions>
+        <style
+            labelFontNameExpression="Label Font Name Expression"
+            labelFontSize="12">
+          <labelBackgroundColor
+              xsi:type="description:SystemColor"
+              href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+          <labelForegroundColor
+              xsi:type="description:SystemColor"
+              href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+          <labelFontFormat>strike_through</labelFontFormat>
+          <labelFontFormat>bold</labelFontFormat>
+        </style>
+        <conditionalStyles
+            preconditionExpression="aql:true">
+          <style
+              labelFontNameExpression="Label Font Name Expression True"
+              labelFontSize="12">
+            <labelBackgroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            <labelForegroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            <labelFontFormat>strike_through</labelFontFormat>
+            <labelFontFormat>bold</labelFontFormat>
+          </style>
+        </conditionalStyles>
+        <conditionalStyles
+            preconditionExpression="aql:false">
+          <style
+              labelFontNameExpression="Label Font Name Expression False"
+              labelFontSize="12">
+            <labelBackgroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            <labelForegroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+            <labelFontFormat>strike_through</labelFontFormat>
+            <labelFontFormat>bold</labelFontFormat>
+          </style>
+        </conditionalStyles>
+      </controls>
+    </groups>
+  </extensions>
+</description:Group>
diff --git a/plugins/org.eclipse.sirius.tests.ui.properties/data/sirius.xmi b/plugins/org.eclipse.sirius.tests.ui.properties/data/sirius.odesign
index b2c590117a..b2c590117a 100644
--- a/plugins/org.eclipse.sirius.tests.ui.properties/data/sirius.xmi
+++ b/plugins/org.eclipse.sirius.tests.ui.properties/data/sirius.odesign
diff --git a/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/AllTests.java b/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/AllTests.java
index bfa00eacd7..c3265f3cb3 100644
--- a/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/AllTests.java
+++ b/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/AllTests.java
@@ -11,6 +11,7 @@
 package org.eclipse.sirius.tests.ui.properties.internal;
 
 import org.eclipse.sirius.tests.ui.properties.internal.converters.ConverterTests;
+import org.eclipse.sirius.tests.ui.properties.internal.migration.ReferenceMigrationTests;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
@@ -21,7 +22,7 @@ import org.junit.runners.Suite.SuiteClasses;
  * @author sbegaudeau
  */
 @RunWith(Suite.class)
-@SuiteClasses({ ConverterTests.class })
+@SuiteClasses({ ConverterTests.class, ReferenceMigrationTests.class })
 public final class AllTests {
     /**
      * The constructor.
diff --git a/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/converters/ConverterTests.java b/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/converters/ConverterTests.java
index cd50c2a54d..97e2285a5c 100644
--- a/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/converters/ConverterTests.java
+++ b/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/converters/ConverterTests.java
@@ -53,7 +53,7 @@ public class ConverterTests {
     /**
      * The path of the Sirius model in the bundle.
      */
-    private static final String SIRIUS_MODEL_PATH = "/data/sirius.xmi";
+    private static final String SIRIUS_MODEL_PATH = "/data/sirius.odesign";
 
     /**
      * This test is used to ensure the proper transformation of a Sirius
diff --git a/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/migration/ReferenceMigrationTests.java b/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/migration/ReferenceMigrationTests.java
new file mode 100644
index 0000000000..cc63b1ed16
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.ui.properties/src/org/eclipse/sirius/tests/ui/properties/internal/migration/ReferenceMigrationTests.java
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * 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.sirius.tests.ui.properties.internal.migration;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.eclipse.eef.EefPackage;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.compare.Comparison;
+import org.eclipse.emf.compare.Diff;
+import org.eclipse.emf.compare.EMFCompare;
+import org.eclipse.emf.compare.match.DefaultComparisonFactory;
+import org.eclipse.emf.compare.match.DefaultEqualityHelperFactory;
+import org.eclipse.emf.compare.match.DefaultMatchEngine;
+import org.eclipse.emf.compare.match.IComparisonFactory;
+import org.eclipse.emf.compare.match.IMatchEngine;
+import org.eclipse.emf.compare.match.eobject.IEObjectMatcher;
+import org.eclipse.emf.compare.match.impl.MatchEngineFactoryImpl;
+import org.eclipse.emf.compare.match.impl.MatchEngineFactoryRegistryImpl;
+import org.eclipse.emf.compare.scope.DefaultComparisonScope;
+import org.eclipse.emf.compare.scope.IComparisonScope;
+import org.eclipse.emf.compare.utils.UseIdentifiers;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.viewpoint.description.Group;
+import org.junit.Test;
+
+/**
+ * Tests of the migration of the reference widget in an odesign file.
+ * 
+ * @author sbegaudeau
+ */
+public class ReferenceMigrationTests {
+    /**
+     * The path of the Sirius model before the migration in the bundle.
+     */
+    private static final String OLD_MODEL_PATH = "/data/migration/before_reference.odesign";
+
+    /**
+     * The path of the Sirius model after the migration in the bundle.
+     */
+    private static final String NEW_MODEL_PATH = "/data/migration/after_reference.odesign";
+
+    /**
+     * This test will ensure that the reference widget is properly transformed
+     * into a label, hyperlink and a list.
+     */
+    @Test
+    public void testReferenceMigration() {
+        EObject beforeMigration = this.load(OLD_MODEL_PATH).getContents().get(0);
+        if (beforeMigration instanceof Group && ((Group) beforeMigration).getExtensions().size() == 1) {
+            beforeMigration = ((Group) beforeMigration).getExtensions().get(0);
+        }
+
+        EObject afterMigration = this.load(NEW_MODEL_PATH).getContents().get(0);
+        if (afterMigration instanceof Group && ((Group) afterMigration).getExtensions().size() == 1) {
+            afterMigration = ((Group) afterMigration).getExtensions().get(0);
+        }
+
+        IComparisonScope scope = new DefaultComparisonScope(beforeMigration, afterMigration, null);
+        IEObjectMatcher matcher = DefaultMatchEngine.createDefaultEObjectMatcher(UseIdentifiers.NEVER);
+        IComparisonFactory comparisonFactory = new DefaultComparisonFactory(new DefaultEqualityHelperFactory());
+        IMatchEngine.Factory matchEngineFactory = new MatchEngineFactoryImpl(matcher, comparisonFactory);
+        matchEngineFactory.setRanking(20);
+        IMatchEngine.Factory.Registry matchEngineRegistry = new MatchEngineFactoryRegistryImpl();
+        matchEngineRegistry.add(matchEngineFactory);
+
+        EMFCompare comparator = EMFCompare.builder().setMatchEngineFactoryRegistry(matchEngineRegistry).build();
+        Comparison comparison = comparator.compare(scope);
+        List<Diff> differences = comparison.getDifferences();
+
+        assertEquals(0, differences.size());
+    }
+
+    /**
+     * Loads the resource with the given URI in a new resource set and return
+     * it.
+     * 
+     * @param uri
+     *            The URI of the resource to load
+     * @return The resource loaded
+     */
+    private Resource load(String uri) {
+        ResourceSet resourceSet = new ResourceSetImpl();
+        resourceSet.getPackageRegistry().put(EefPackage.eNS_URI, EefPackage.eINSTANCE);
+        resourceSet.getPackageRegistry().put(PropertiesPackage.eNS_URI, PropertiesPackage.eINSTANCE);
+        resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xmi", new XMIResourceFactoryImpl()); //$NON-NLS-1$
+        Resource resource = resourceSet.getResource(URI.createFileURI(System.getProperty("user.dir") + uri), true);
+        resource.setURI(URI.createURI(OLD_MODEL_PATH));
+        return resource;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.ui.properties/plugin.xml b/plugins/org.eclipse.sirius.ui.properties/plugin.xml
index d99e5de794..a097532376 100644
--- a/plugins/org.eclipse.sirius.ui.properties/plugin.xml
+++ b/plugins/org.eclipse.sirius.ui.properties/plugin.xml
@@ -78,5 +78,9 @@
            class="org.eclipse.sirius.ui.properties.internal.migration.FontSizeMigrationParticipant"
            kind="VSM">
      </participant>
+     <participant
+           class="org.eclipse.sirius.ui.properties.internal.migration.ReferenceWidgetMigrationParticipant"
+           kind="VSM">
+     </participant>
   </extension>
 </plugin>
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/PropertiesInterpretedExpressionQuery.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/PropertiesInterpretedExpressionQuery.java
index 9415209789..883ab4cb08 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/PropertiesInterpretedExpressionQuery.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/expressions/PropertiesInterpretedExpressionQuery.java
@@ -187,9 +187,6 @@ public final class PropertiesInterpretedExpressionQuery extends AbstractInterpre
             } else if (feature == PropertiesPackage.Literals.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION) {
                 VariableType candidatesExpressionType = getResultType(target, PropertiesPackage.Literals.RADIO_DESCRIPTION__CANDIDATES_EXPRESSION);
                 availableVariables.put(EEFExpressionUtils.EEFSelect.CANDIDATE, candidatesExpressionType);
-            } else if (feature == PropertiesPackage.Literals.REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION) {
-                VariableType valueExpressionType = getResultType(target, PropertiesPackage.Literals.REFERENCE_DESCRIPTION__VALUE_EXPRESSION);
-                availableVariables.put(EEFExpressionUtils.EEFReference.VALUE, valueExpressionType);
             } else if (feature == PropertiesPackage.Literals.DYNAMIC_MAPPING_IF__PREDICATE_EXPRESSION) {
                 if (target.eContainer() instanceof DynamicMappingFor) {
                     DynamicMappingFor forDefinition = (DynamicMappingFor) target.eContainer();
@@ -241,18 +238,10 @@ public final class PropertiesInterpretedExpressionQuery extends AbstractInterpre
                 }
             } else if (callbackFeature == PropertiesPackage.Literals.RADIO_DESCRIPTION__INITIAL_OPERATION) {
                 availableVariables.put(EEFExpressionUtils.EEFText.NEW_VALUE, stringType);
-            } else if (callbackFeature == PropertiesPackage.Literals.REFERENCE_DESCRIPTION__ON_CLICK_OPERATION) {
-                Option<Collection<String>> domainClass = VSMNavigation.getDomainClassFromContainingGroup(toolContext);
-                if (domainClass.some()) {
-                    availableVariables.put(EEFExpressionUtils.EEFReference.SELECTION, VariableType.fromStrings(domainClass.get()));
-                } else {
-                    availableVariables.put(EEFExpressionUtils.EEFHyperlink.SELECTION, unkownType);
-                }
-                availableVariables.put(EEFExpressionUtils.EEFReference.ON_CLICK_EVENT_KIND, stringType);
             } else if (callbackFeature == PropertiesPackage.Literals.WIDGET_ACTION__INITIAL_OPERATION) {
                 Option<Collection<String>> domainClass = VSMNavigation.getDomainClassFromContainingGroup(toolContext);
-                if (domainClass.some()) {
-                    availableVariables.put(EEFExpressionUtils.EEFReference.SELECTION, VariableType.fromStrings(domainClass.get()));
+                if (!domainClass.some()) {
+                    availableVariables.put(EEFExpressionUtils.EEFHyperlink.SELECTION, VariableType.fromStrings(domainClass.get()));
                 } else {
                     availableVariables.put(EEFExpressionUtils.EEFHyperlink.SELECTION, unkownType);
                 }
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/migration/ReferenceWidgetMigrationParticipant.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/migration/ReferenceWidgetMigrationParticipant.java
new file mode 100644
index 0000000000..998381657f
--- /dev/null
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/migration/ReferenceWidgetMigrationParticipant.java
@@ -0,0 +1,291 @@
+/*******************************************************************************
+ * 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.sirius.ui.properties.internal.migration;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.sirius.business.api.migration.AbstractVSMMigrationParticipant;
+import org.eclipse.sirius.properties.ContainerDescription;
+import org.eclipse.sirius.properties.ControlDescription;
+import org.eclipse.sirius.properties.GroupDescription;
+import org.eclipse.sirius.properties.HyperlinkDescription;
+import org.eclipse.sirius.properties.HyperlinkWidgetConditionalStyle;
+import org.eclipse.sirius.properties.HyperlinkWidgetStyle;
+import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.LabelWidgetConditionalStyle;
+import org.eclipse.sirius.properties.LabelWidgetStyle;
+import org.eclipse.sirius.properties.ListDescription;
+import org.eclipse.sirius.properties.ListWidgetConditionalStyle;
+import org.eclipse.sirius.properties.ListWidgetStyle;
+import org.eclipse.sirius.properties.PageDescription;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.ViewExtensionDescription;
+import org.eclipse.sirius.viewpoint.description.Extension;
+import org.eclipse.sirius.viewpoint.description.Group;
+import org.osgi.framework.Version;
+
+/**
+ * The migration participant used to convert the old reference widget to lists,
+ * labels or hyperlinks.
+ * 
+ * @author sbegaudeau
+ */
+public class ReferenceWidgetMigrationParticipant extends AbstractVSMMigrationParticipant {
+
+    /**
+     * The version of the migration.
+     */
+    private static final Version MIGRATION_VERSION = new Version("11.0.0.201609021200"); //$NON-NLS-1$
+
+    /**
+     * The name of the type to migrate.
+     */
+    private static final String REFERENCE_DESCRIPTION_TYPE = "ReferenceDescription"; //$NON-NLS-1$
+
+    /**
+     * The name of the "multiple" EAttribute.
+     */
+    private static final String REFERENCE_DESCRIPTION_MULTIPLE = "multiple"; //$NON-NLS-1$
+
+    /**
+     * The EClass used for the dynamic EObject that will be used as placeholders
+     * for the old reference widgets.
+     */
+    private final EClass placeholderReferenceDescriptionEClass;
+
+    /**
+     * The constructor.
+     */
+    public ReferenceWidgetMigrationParticipant() {
+        EPackage placeholderEPackage = EcoreFactory.eINSTANCE.createEPackage();
+        EFactory placeholderEFactory = EcoreFactory.eINSTANCE.createEFactory();
+
+        this.placeholderReferenceDescriptionEClass = EcoreFactory.eINSTANCE.createEClass();
+
+        this.placeholderReferenceDescriptionEClass.setName(REFERENCE_DESCRIPTION_TYPE);
+        this.placeholderReferenceDescriptionEClass.getESuperTypes().add(PropertiesPackage.Literals.LIST_DESCRIPTION);
+        EAttribute multipleEAttribute = EcoreFactory.eINSTANCE.createEAttribute();
+        multipleEAttribute.setName(REFERENCE_DESCRIPTION_MULTIPLE);
+        multipleEAttribute.setEType(EcorePackage.Literals.EBOOLEAN);
+        this.placeholderReferenceDescriptionEClass.getEStructuralFeatures().add(multipleEAttribute);
+
+        placeholderEPackage.getEClassifiers().add(this.placeholderReferenceDescriptionEClass);
+        placeholderEPackage.setEFactoryInstance(placeholderEFactory);
+    }
+
+    @Override
+    public Version getMigrationVersion() {
+        return MIGRATION_VERSION;
+    }
+
+    @Override
+    public EClassifier getType(EPackage ePackage, String name, String loadedVersion) {
+        // Replaces the old reference widgets with lit widgets with a custom
+        // EClass
+        EClassifier eClassifier = null;
+        if (REFERENCE_DESCRIPTION_TYPE.equals(name)) {
+            eClassifier = this.placeholderReferenceDescriptionEClass;
+        }
+        if (eClassifier == null) {
+            eClassifier = super.getType(ePackage, name, loadedVersion);
+        }
+        return eClassifier;
+    }
+
+    @Override
+    protected void postLoad(Group group, Version loadedVersion) {
+        super.postLoad(group, loadedVersion);
+
+        List<Extension> extensions = group.getExtensions();
+        for (Extension extension : extensions) {
+            if (extension instanceof ViewExtensionDescription) {
+                ViewExtensionDescription viewExtensionDescription = (ViewExtensionDescription) extension;
+
+                Set<GroupDescription> groups = new LinkedHashSet<>();
+                for (PageDescription pageDescription : viewExtensionDescription.getPages()) {
+                    groups.addAll(pageDescription.getGroups());
+                }
+                groups.addAll(viewExtensionDescription.getGroups());
+
+                for (GroupDescription groupDescription : groups) {
+                    List<ControlDescription> controls = groupDescription.getControls();
+                    for (ControlDescription controlDescription : controls) {
+                        this.handleControl(controlDescription);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * This method navigates recursively on the various controls in order to
+     * find all the widgets with our custom EClass in order to replace them
+     * while keeping the order of the controls in the model.
+     * 
+     * @param controlDescription
+     *            The description of a control
+     */
+    private void handleControl(ControlDescription controlDescription) {
+        if (controlDescription instanceof ContainerDescription) {
+            ContainerDescription containerDescription = (ContainerDescription) controlDescription;
+            List<ControlDescription> controls = containerDescription.getControls();
+            for (ControlDescription control : controls) {
+                this.handleControl(control);
+            }
+        } else if (controlDescription instanceof ListDescription && controlDescription.eClass().equals(this.placeholderReferenceDescriptionEClass)) {
+            ListDescription listDescription = (ListDescription) controlDescription;
+
+            EObject newDescription = null;
+            Object object = listDescription.eGet(this.placeholderReferenceDescriptionEClass.getEStructuralFeature(REFERENCE_DESCRIPTION_MULTIPLE));
+            if (Boolean.TRUE.equals(object)) {
+                newDescription = this.handleList(listDescription);
+            } else if (Boolean.FALSE.equals(object) && listDescription.getOnClickOperation() != null) {
+                newDescription = this.handleHyperlink(listDescription);
+            } else if (Boolean.FALSE.equals(object) && listDescription.getOnClickOperation() == null) {
+                newDescription = this.handleLabel(listDescription);
+            }
+
+            if (newDescription != null) {
+                EcoreUtil.replace(listDescription, newDescription);
+            }
+        }
+    }
+
+    /**
+     * Handles the creation of a proper list widget form our list placeholder.
+     * 
+     * @param listDescription
+     *            The placeholder
+     * @return A list widget
+     */
+    private ListDescription handleList(ListDescription listDescription) {
+        ListDescription list = PropertiesFactory.eINSTANCE.createListDescription();
+        list.setIdentifier(listDescription.getIdentifier());
+        list.setHelpExpression(listDescription.getHelpExpression());
+        list.setDisplayExpression(listDescription.getDisplayExpression());
+        list.setIsEnabledExpression(listDescription.getIsEnabledExpression());
+        list.setLabelExpression(listDescription.getLabelExpression());
+        list.setValueExpression(listDescription.getValueExpression());
+        list.getActions().addAll(listDescription.getActions());
+        list.setOnClickOperation(listDescription.getOnClickOperation());
+        list.setStyle(listDescription.getStyle());
+        list.getConditionalStyles().addAll(listDescription.getConditionalStyles());
+        return list;
+    }
+
+    /**
+     * Handles the creation of a proper hyperlink widget form our list
+     * placeholder.
+     * 
+     * @param listDescription
+     *            The placeholder
+     * @return A hyperlink widget
+     */
+    private HyperlinkDescription handleHyperlink(ListDescription listDescription) {
+        HyperlinkDescription hyperlink = PropertiesFactory.eINSTANCE.createHyperlinkDescription();
+        hyperlink.setIdentifier(listDescription.getIdentifier());
+        hyperlink.setHelpExpression(listDescription.getHelpExpression());
+        hyperlink.setDisplayExpression(listDescription.getDisplayExpression());
+        hyperlink.setIsEnabledExpression(listDescription.getIsEnabledExpression());
+        hyperlink.setLabelExpression(listDescription.getLabelExpression());
+        hyperlink.setValueExpression(listDescription.getValueExpression());
+        hyperlink.getActions().addAll(listDescription.getActions());
+        hyperlink.setInitialOperation(listDescription.getOnClickOperation());
+
+        ListWidgetStyle listWidgetStyle = listDescription.getStyle();
+        hyperlink.setStyle(this.handleHyperlinkStyle(listWidgetStyle));
+
+        List<ListWidgetConditionalStyle> listConditionalStyles = listDescription.getConditionalStyles();
+        for (ListWidgetConditionalStyle listWidgetConditionalStyle : listConditionalStyles) {
+            HyperlinkWidgetConditionalStyle hyperlinkWidgetConditionalStyle = PropertiesFactory.eINSTANCE.createHyperlinkWidgetConditionalStyle();
+            hyperlinkWidgetConditionalStyle.setPreconditionExpression(listWidgetConditionalStyle.getPreconditionExpression());
+            hyperlinkWidgetConditionalStyle.setStyle(this.handleHyperlinkStyle(listWidgetConditionalStyle.getStyle()));
+            hyperlink.getConditionalStyles().add(hyperlinkWidgetConditionalStyle);
+        }
+        return hyperlink;
+    }
+
+    /**
+     * Creates a hyperlink style from the style of the placeholder.
+     * 
+     * @param listWidgetStyle
+     *            The style of the placeholder
+     * @return A hyperlink style
+     */
+    private HyperlinkWidgetStyle handleHyperlinkStyle(ListWidgetStyle listWidgetStyle) {
+        HyperlinkWidgetStyle hyperlinkWidgetStyle = PropertiesFactory.eINSTANCE.createHyperlinkWidgetStyle();
+        hyperlinkWidgetStyle.setLabelBackgroundColor(listWidgetStyle.getLabelBackgroundColor());
+        hyperlinkWidgetStyle.setLabelForegroundColor(listWidgetStyle.getLabelForegroundColor());
+        hyperlinkWidgetStyle.setLabelFontNameExpression(listWidgetStyle.getLabelFontNameExpression());
+        hyperlinkWidgetStyle.setLabelFontSizeExpression(listWidgetStyle.getLabelFontSizeExpression());
+        hyperlinkWidgetStyle.getLabelFontFormat().addAll(listWidgetStyle.getLabelFontFormat());
+        return hyperlinkWidgetStyle;
+    }
+
+    /**
+     * Handles the creation of a proper label widget form our list placeholder.
+     * 
+     * @param listDescription
+     *            The placeholder
+     * @return A label widget
+     */
+    private LabelDescription handleLabel(ListDescription listDescription) {
+        LabelDescription label = PropertiesFactory.eINSTANCE.createLabelDescription();
+        label.setIdentifier(listDescription.getIdentifier());
+        label.setHelpExpression(listDescription.getHelpExpression());
+        label.setDisplayExpression(listDescription.getDisplayExpression());
+        label.setIsEnabledExpression(listDescription.getIsEnabledExpression());
+        label.setLabelExpression(listDescription.getLabelExpression());
+        label.setValueExpression(listDescription.getValueExpression());
+        label.getActions().addAll(listDescription.getActions());
+
+        ListWidgetStyle listWidgetStyle = listDescription.getStyle();
+        label.setStyle(this.handleLabelStyle(listWidgetStyle));
+
+        List<ListWidgetConditionalStyle> listConditionalStyles = listDescription.getConditionalStyles();
+        for (ListWidgetConditionalStyle listWidgetConditionalStyle : listConditionalStyles) {
+            LabelWidgetConditionalStyle labelWidgetConditionalStyle = PropertiesFactory.eINSTANCE.createLabelWidgetConditionalStyle();
+            labelWidgetConditionalStyle.setPreconditionExpression(listWidgetConditionalStyle.getPreconditionExpression());
+            labelWidgetConditionalStyle.setStyle(this.handleLabelStyle(listWidgetConditionalStyle.getStyle()));
+            label.getConditionalStyles().add(labelWidgetConditionalStyle);
+        }
+        return label;
+    }
+
+    /**
+     * Creates a label style from the style of the placeholder.
+     * 
+     * @param listWidgetStyle
+     *            The style of the placeholder
+     * @return A lael style
+     */
+    private LabelWidgetStyle handleLabelStyle(ListWidgetStyle listWidgetStyle) {
+        LabelWidgetStyle labelWidgetStyle = PropertiesFactory.eINSTANCE.createLabelWidgetStyle();
+        labelWidgetStyle.setLabelBackgroundColor(listWidgetStyle.getLabelBackgroundColor());
+        labelWidgetStyle.setLabelForegroundColor(listWidgetStyle.getLabelForegroundColor());
+        labelWidgetStyle.setLabelFontNameExpression(listWidgetStyle.getLabelFontNameExpression());
+        labelWidgetStyle.setLabelFontSizeExpression(listWidgetStyle.getLabelFontSizeExpression());
+        labelWidgetStyle.getLabelFontFormat().addAll(listWidgetStyle.getLabelFontFormat());
+        return labelWidgetStyle;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/PropertiesDescriptionConverterSwitch.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/PropertiesDescriptionConverterSwitch.java
index 9d21c206d9..3a8bf25de9 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/PropertiesDescriptionConverterSwitch.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/PropertiesDescriptionConverterSwitch.java
@@ -44,9 +44,6 @@ import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
 import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
 import org.eclipse.sirius.properties.RadioWidgetStyle;
-import org.eclipse.sirius.properties.ReferenceDescription;
-import org.eclipse.sirius.properties.ReferenceWidgetConditionalStyle;
-import org.eclipse.sirius.properties.ReferenceWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
 import org.eclipse.sirius.properties.SelectWidgetStyle;
@@ -229,12 +226,6 @@ public class PropertiesDescriptionConverterSwitch extends PropertiesSwitch<IDesc
     }
 
     @Override
-    public IDescriptionConverter caseReferenceDescription(ReferenceDescription object) {
-        return new DefaultDescriptionWithInitialOperationConverter<>(ReferenceDescription.class, EefPackage.Literals.EEF_REFERENCE_DESCRIPTION,
-                EefPackage.Literals.EEF_REFERENCE_DESCRIPTION__ON_CLICK_EXPRESSION);
-    }
-
-    @Override
     public IDescriptionConverter caseListDescription(ListDescription object) {
         return new DefaultDescriptionWithInitialOperationConverter<>(ListDescription.class, EefPackage.Literals.EEF_LIST_DESCRIPTION, EefPackage.Literals.EEF_LIST_DESCRIPTION__ON_CLICK_EXPRESSION);
     }
@@ -245,16 +236,6 @@ public class PropertiesDescriptionConverterSwitch extends PropertiesSwitch<IDesc
     }
 
     @Override
-    public IDescriptionConverter caseReferenceWidgetStyle(ReferenceWidgetStyle object) {
-        return new DefaultStyleDescriptionConverter<>(ReferenceWidgetStyle.class, EefPackage.Literals.EEF_REFERENCE_STYLE);
-    }
-
-    @Override
-    public IDescriptionConverter caseReferenceWidgetConditionalStyle(ReferenceWidgetConditionalStyle object) {
-        return new DefaultDescriptionConverter<>(ReferenceWidgetConditionalStyle.class, EefPackage.Literals.EEF_REFERENCE_CONDITIONAL_STYLE);
-    }
-
-    @Override
     public IDescriptionConverter caseListWidgetStyle(ListWidgetStyle object) {
         return new DefaultStyleDescriptionConverter<>(ListWidgetStyle.class, EefPackage.Literals.EEF_LIST_STYLE);
     }