[482528] Contribute styling for the text widget

Bug: 482528
Change-Id: I34c2c3ffeef4c9fdeeded82ef1576d4483250492
Signed-off-by: Mélanie Bats <melanie.bats@obeo.fr>

100 files changed, 3783 insertions, 1117 deletions

diff --git a/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml b/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
index d75cc1555f..482406dca1 100644
--- a/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
+++ b/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
@@ -261,4 +261,26 @@
    
       </description>
    </context>
+   <context id="WidgetStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code WidgetStyle description -->
+   
+   <!-- End of user code WidgetStyle description -->
+   
+      </description>
+   </context>
+   <context id="TextStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code TextStyle description -->
+   
+   <!-- End of user code TextStyle description -->
+   
+      </description>
+   </context>
 </contexts>
\ No newline at end of file
diff --git a/incubation/org.eclipse.sirius.editor.properties/plugin.xml b/incubation/org.eclipse.sirius.editor.properties/plugin.xml
index 6ece204fc8..e908ea82c9 100644
--- a/incubation/org.eclipse.sirius.editor.properties/plugin.xml
+++ b/incubation/org.eclipse.sirius.editor.properties/plugin.xml
@@ -19,6 +19,45 @@
   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections">
     <propertySections contributorId="org.eclipse.sirius.editor.editorPlugin.SiriusEditorContributor">
   	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle.TextStyleFontFormatPropertySection"
+               id="properties.section.textStyle.FontFormat"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle.TextStyleFontFormatFilter"
+               afterSection="properties.section.textStyle.ForegroundColor"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.TextStyle"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle.TextStyleForegroundColorPropertySection"
+               id="properties.section.textStyle.ForegroundColor"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle.TextStyleForegroundColorFilter"
+               afterSection="properties.section.textStyle.BackgroundColor"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.TextStyle"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle.TextStyleBackgroundColorPropertySection"
+               id="properties.section.textStyle.BackgroundColor"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle.TextStyleBackgroundColorFilter"
+               afterSection="properties.section.textStyle.FontSize"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.TextStyle"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle.TextStyleFontSizePropertySection"
+               id="properties.section.textStyle.FontSize"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle.TextStyleFontSizeFilter"
+               afterSection="properties.section.textStyle.FontNameExpression"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.TextStyle"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.textstyle.TextStyleFontNameExpressionPropertySection"
+               id="properties.section.textStyle.FontNameExpression"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textstyle.TextStyleFontNameExpressionFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.TextStyle"/>
+      </propertySection>
+  	  <propertySection
                class="org.eclipse.sirius.properties.editor.properties.sections.properties.customoperation.CustomOperationIdentifierPropertySection"
                id="properties.section.customOperation.Identifier"
                filter="org.eclipse.sirius.properties.editor.properties.filters.properties.customoperation.CustomOperationIdentifierFilter"
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleBackgroundColorFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleBackgroundColorFilter.java
new file mode 100644
index 0000000000..6c35e2cc1b
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleBackgroundColorFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * 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.textstyle;
+
+// 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 backgroundColor property section.
+ */
+public class TextStyleBackgroundColorFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getTextStyle_BackgroundColor();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.TextStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontFormatFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontFormatFilter.java
new file mode 100644
index 0000000000..9222c0f5c0
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontFormatFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * 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.textstyle;
+
+// 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 fontFormat property section.
+ */
+public class TextStyleFontFormatFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getTextStyle_FontFormat();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.TextStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontNameExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontNameExpressionFilter.java
new file mode 100644
index 0000000000..394052c186
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontNameExpressionFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * 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.textstyle;
+
+// 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 fontNameExpression property section.
+ */
+public class TextStyleFontNameExpressionFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getTextStyle_FontNameExpression();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.TextStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontSizeFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontSizeFilter.java
new file mode 100644
index 0000000000..f39462a0b1
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleFontSizeFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * 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.textstyle;
+
+// 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 fontSize property section.
+ */
+public class TextStyleFontSizeFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getTextStyle_FontSize();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.TextStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleForegroundColorFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleForegroundColorFilter.java
new file mode 100644
index 0000000000..df99b9ae0c
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textstyle/TextStyleForegroundColorFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * 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.textstyle;
+
+// 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 foregroundColor property section.
+ */
+public class TextStyleForegroundColorFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getTextStyle_ForegroundColor();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.TextStyle;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleBackgroundColorPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleBackgroundColorPropertySection.java
new file mode 100644
index 0000000000..ae5a10ffb8
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleBackgroundColorPropertySection.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * 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.textstyle;
+
+// Start of user code imports
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the backgroundColor property of a TextStyle object.
+ */
+public class TextStyleBackgroundColorPropertySection extends AbstractComboPropertySection {
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "BackgroundColor"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#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.AbstractComboPropertySection#getFeature()
+     */
+    @Override
+    protected EReference getFeature() {
+        return PropertiesPackage.eINSTANCE.getTextStyle_BackgroundColor();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getFeatureValue(int)
+     */
+    @Override
+    protected Object getFeatureValue(int index) {
+        return getFeatureValueAt(index);
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#isEqual(int)
+     */
+    @Override
+    protected boolean isEqual(int index) {
+        boolean isEqual = false;
+        if (getFeatureValueAt(index) == null) {
+            isEqual = eObject.eGet(getFeature()) == null;
+        } else {
+            isEqual = getFeatureValueAt(index).equals(eObject.eGet(getFeature()));
+        }
+        return isEqual;
+    }
+
+    /**
+     * Returns the value at the specified index in the choice of values for the
+     * feature.
+     *
+     * @param index
+     *            Index of the value.
+     * @return the value at the specified index in the choice of values.
+     */
+    protected Object getFeatureValueAt(int index) {
+        List<?> values = getChoiceOfValues();
+        if (values.size() < index || values.size() == 0 || index == -1) {
+            return null;
+        }
+        return values.get(index);
+    }
+
+    /**
+     * Fetches the list of available values for the feature.
+     *
+     * @return The list of available values for the feature.
+     */
+    @Override
+    protected List<?> getChoiceOfValues() {
+        List<?> values = Collections.emptyList();
+        List<IItemPropertyDescriptor> propertyDescriptors = getDescriptors();
+        for (IItemPropertyDescriptor propertyDescriptor : propertyDescriptors) {
+            if (((EStructuralFeature) propertyDescriptor.getFeature(eObject)) == getFeature()) {
+                values = new ArrayList<Object>(propertyDescriptor.getChoiceOfValues(eObject));
+            }
+        }
+
+        // Start of user code choice of values
+        // End of user code choice of values
+        return values;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+        // Start of user code create controls
+
+        // End of user code create controls
+    }
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontFormatPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontFormatPropertySection.java
new file mode 100644
index 0000000000..27c7a965a5
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontFormatPropertySection.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * 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.textstyle;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.viewpoint.FontFormat;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+/**
+ * A section for the fontFormat property of a TextStyle object.
+ */
+public class TextStyleFontFormatPropertySection extends AbstractEditorDialogPropertySection {
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "FontFormat"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#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.AbstractEditorDialogPropertySection#getFeature()
+     */
+    @Override
+    protected EAttribute getFeature() {
+        return PropertiesPackage.eINSTANCE.getTextStyle_FontFormat();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getFeatureAsText()
+     */
+    @Override
+    protected String getFeatureAsText() {
+        String string = new String();
+
+        if (eObject.eGet(getFeature()) != null) {
+            List<?> values = (List<?>) eObject.eGet(getFeature());
+            for (Iterator<?> iterator = values.iterator(); iterator.hasNext();) {
+                string += getAdapterFactoryLabelProvider().getText(iterator.next());
+                if (iterator.hasNext()) {
+                    string += ", ";
+                }
+            }
+        }
+
+        return string;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#isEqual(List)
+     */
+    @Override
+    protected boolean isEqual(List<?> newList) {
+        return newList.equals(eObject.eGet(getFeature()));
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getEnumerationFeatureValues()
+     */
+    @Override
+    protected List<?> getChoiceOfValues() {
+        return FontFormat.VALUES;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+    }
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontNameExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontNameExpressionPropertySection.java
new file mode 100644
index 0000000000..2a7eb85761
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontNameExpressionPropertySection.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * 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.textstyle;
+
+// Start of user code imports
+
+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 fontNameExpression property of a TextStyle object.
+ */
+public class TextStyleFontNameExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient {
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "FontNameExpression"; //$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.getTextStyle_FontNameExpression();
+    }
+
+    /**
+     * @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(), TextStyleFontNameExpressionPropertySection.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/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontSizePropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontSizePropertySection.java
new file mode 100644
index 0000000000..7fedfef826
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleFontSizePropertySection.java
@@ -0,0 +1,112 @@
+/*******************************************************************************
+ * 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.textstyle;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractSpinnerPropertySection;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+/**
+ * A section for the fontSize property of a TextStyle object.
+ */
+public class TextStyleFontSizePropertySection extends AbstractSpinnerPropertySection {
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "FontSize"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#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.AbstractSpinnerPropertySection#getFeature()
+     */
+    @Override
+    protected EAttribute getFeature() {
+        return PropertiesPackage.eINSTANCE.getTextStyle_FontSize();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getFeatureAsInteger()
+     */
+    @Override
+    protected String getFeatureAsText() {
+        String value = new String();
+        if (eObject.eGet(getFeature()) != null) {
+            value = toInteger(eObject.eGet(getFeature()).toString()).toString();
+        }
+        return value;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#isEqual(int)
+     */
+    @Override
+    protected boolean isEqual(String newText) {
+        boolean equal = true;
+        if (toInteger(newText) != null) {
+            equal = getFeatureAsText().equals(toInteger(newText).toString());
+        } else {
+            refresh();
+        }
+        return equal;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getFeatureValue(int)
+     */
+    @Override
+    protected Object getFeatureValue(String newText) {
+        return toInteger(newText);
+    }
+
+    /**
+     * Converts the given text to the integer it represents if applicable.
+     *
+     * @return The integer the given text represents if applicable,
+     *         <code>null</code> otherwise.
+     */
+    private Integer toInteger(String text) {
+        Integer integerValue = null;
+        try {
+            integerValue = new Integer(text);
+        } catch (NumberFormatException e) {
+            // Not a Integer
+        }
+        return integerValue;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+
+        // Start of user code create controls
+
+        // End of user code create controls
+    }
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleForegroundColorPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleForegroundColorPropertySection.java
new file mode 100644
index 0000000000..1b365fe567
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textstyle/TextStyleForegroundColorPropertySection.java
@@ -0,0 +1,132 @@
+/*******************************************************************************
+ * 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.textstyle;
+
+// Start of user code imports
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the foregroundColor property of a TextStyle object.
+ */
+public class TextStyleForegroundColorPropertySection extends AbstractComboPropertySection {
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "ForegroundColor"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#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.AbstractComboPropertySection#getFeature()
+     */
+    @Override
+    protected EReference getFeature() {
+        return PropertiesPackage.eINSTANCE.getTextStyle_ForegroundColor();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getFeatureValue(int)
+     */
+    @Override
+    protected Object getFeatureValue(int index) {
+        return getFeatureValueAt(index);
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#isEqual(int)
+     */
+    @Override
+    protected boolean isEqual(int index) {
+        boolean isEqual = false;
+        if (getFeatureValueAt(index) == null) {
+            isEqual = eObject.eGet(getFeature()) == null;
+        } else {
+            isEqual = getFeatureValueAt(index).equals(eObject.eGet(getFeature()));
+        }
+        return isEqual;
+    }
+
+    /**
+     * Returns the value at the specified index in the choice of values for the
+     * feature.
+     *
+     * @param index
+     *            Index of the value.
+     * @return the value at the specified index in the choice of values.
+     */
+    protected Object getFeatureValueAt(int index) {
+        List<?> values = getChoiceOfValues();
+        if (values.size() < index || values.size() == 0 || index == -1) {
+            return null;
+        }
+        return values.get(index);
+    }
+
+    /**
+     * Fetches the list of available values for the feature.
+     *
+     * @return The list of available values for the feature.
+     */
+    @Override
+    protected List<?> getChoiceOfValues() {
+        List<?> values = Collections.emptyList();
+        List<IItemPropertyDescriptor> propertyDescriptors = getDescriptors();
+        for (IItemPropertyDescriptor propertyDescriptor : propertyDescriptors) {
+            if (((EStructuralFeature) propertyDescriptor.getFeature(eObject)) == getFeature()) {
+                values = new ArrayList<Object>(propertyDescriptor.getChoiceOfValues(eObject));
+            }
+        }
+
+        // Start of user code choice of values
+        // End of user code choice of values
+        return values;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+        // Start of user code create controls
+
+        // End of user code create controls
+    }
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/TextStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/TextStyle.gif
new file mode 100644
index 0000000000..904159880b
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/TextStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/WidgetStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/WidgetStyle.gif
new file mode 100644
index 0000000000..53500daf98
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/WidgetStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/plugin.properties b/incubation/org.eclipse.sirius.properties.edit/plugin.properties
index c3bea45284..d5669d7635 100644
--- a/incubation/org.eclipse.sirius.properties.edit/plugin.properties
+++ b/incubation/org.eclipse.sirius.properties.edit/plugin.properties
@@ -124,3 +124,17 @@ _UI_PageValidationSetDescription_semanticValidationRules_feature = Semantic Vali
 _UI_GroupDescription_validationSet_feature = Validation Set
 _UI_GroupValidationSetDescription_semanticValidationRules_feature = Semantic Validation Rules
 _UI_GroupValidationSetDescription_propertyValidationRules_feature = Property Validation Rules
+_UI_WidgetStyle_type = Widget Style
+_UI_TextStyle_type = Text Style
+_UI_TextDescription_style_feature = Style
+_UI_TextStyle_backgroundColorExpression_feature = Background Color Expression
+_UI_TextStyle_foregroundColorExpression_feature = Foreground Color Expression
+_UI_TextStyle_fontNameExpression_feature = Font Name Expression
+_UI_TextStyle_fontSizeExpression_feature = Font Size Expression
+_UI_TextStyle_fontStyleExpression_feature = Font Style Expression
+_UI_TextStyle_fontItalic_feature = Font Italic
+_UI_TextStyle_fontBold_feature = Font Bold
+_UI_TextStyle_fontSize_feature = Font Size
+_UI_TextStyle_backgroundColor_feature = Background Color
+_UI_TextStyle_foregroundColor_feature = Foreground Color
+_UI_TextStyle_fontFormat_feature = Font Format
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
index 5a83741656..4f635dc525 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
@@ -62,7 +62,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This adds a property descriptor for the Button Label Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addButtonLabelExpressionPropertyDescriptor(Object object) {
@@ -79,7 +79,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
      * {@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
@@ -93,7 +93,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -108,7 +108,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns ButtonDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -119,7 +119,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -133,7 +133,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
index 28c119f89b..937edbd578 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
@@ -79,7 +79,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
      * {@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
@@ -93,7 +93,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -108,7 +108,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
     /**
      * This returns CheckboxDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -119,7 +119,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -133,7 +133,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
index d2e44487d7..e40a613309 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
@@ -87,7 +87,7 @@ IItemPropertySource {
      * {@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
@@ -102,7 +102,7 @@ IItemPropertySource {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -117,7 +117,7 @@ IItemPropertySource {
     /**
      * This returns ContainerDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -128,7 +128,7 @@ IItemPropertySource {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -142,7 +142,7 @@ IItemPropertySource {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomDescriptionItemProvider.java
index e851f7d007..cd45342989 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomDescriptionItemProvider.java
@@ -63,7 +63,7 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
      * {@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
@@ -78,7 +78,7 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -93,7 +93,7 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns CustomDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -104,7 +104,7 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -118,7 +118,7 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java
index d4cb60c87d..035f6d5c53 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java
@@ -94,7 +94,7 @@ IItemPropertySource {
     /**
      * This returns CustomExpression.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -105,7 +105,7 @@ IItemPropertySource {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -119,7 +119,7 @@ IItemPropertySource {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java
index e5d8184154..832d285c99 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java
@@ -86,7 +86,7 @@ IItemPropertySource {
      * {@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
@@ -100,7 +100,7 @@ IItemPropertySource {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -115,7 +115,7 @@ IItemPropertySource {
     /**
      * This returns CustomOperation.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -126,7 +126,7 @@ IItemPropertySource {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -140,7 +140,7 @@ IItemPropertySource {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
index 448043edba..fd2203e548 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
@@ -83,7 +83,7 @@ IItemPropertySource {
     /**
      * This adds a property descriptor for the Domain Class Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addDomainClassExpressionPropertyDescriptor(Object object) {
@@ -100,7 +100,7 @@ IItemPropertySource {
      * {@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
@@ -114,7 +114,7 @@ IItemPropertySource {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -129,7 +129,7 @@ IItemPropertySource {
     /**
      * This returns DynamicMappingFor.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -140,7 +140,7 @@ IItemPropertySource {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -154,7 +154,7 @@ IItemPropertySource {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java
index 0b4f70d0bf..f764c1d746 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java
@@ -70,7 +70,7 @@ IItemPropertySource {
     /**
      * This adds a property descriptor for the Predicate Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addPredicateExpressionPropertyDescriptor(Object object) {
@@ -87,7 +87,7 @@ IItemPropertySource {
      * {@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
@@ -101,7 +101,7 @@ IItemPropertySource {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -116,7 +116,7 @@ IItemPropertySource {
     /**
      * This returns DynamicMappingIf.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -127,7 +127,7 @@ IItemPropertySource {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -141,7 +141,7 @@ IItemPropertySource {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
index 5df598fd29..441070c215 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
@@ -110,7 +110,7 @@ IItemPropertySource {
     /**
      * This adds a property descriptor for the Semantic Candidate Expression
      * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addSemanticCandidateExpressionPropertyDescriptor(Object object) {
@@ -127,7 +127,7 @@ IItemPropertySource {
      * {@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
@@ -142,7 +142,7 @@ IItemPropertySource {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -157,7 +157,7 @@ IItemPropertySource {
     /**
      * This returns GroupDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -168,7 +168,7 @@ IItemPropertySource {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -182,7 +182,7 @@ IItemPropertySource {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java
index 55a9beb12f..0468968a32 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java
@@ -35,7 +35,7 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.GroupValidationSetDescription} object.
  * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class GroupValidationSetDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
@@ -72,7 +72,7 @@ IItemPropertySource {
      * {@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
@@ -87,7 +87,7 @@ IItemPropertySource {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -102,7 +102,7 @@ IItemPropertySource {
     /**
      * This returns GroupValidationSetDescription.gif. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -113,7 +113,7 @@ IItemPropertySource {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -126,7 +126,7 @@ IItemPropertySource {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
index 852820f07e..ac10f3bef8 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
@@ -72,7 +72,7 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns LabelDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -83,7 +83,7 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -97,7 +97,7 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/MultipleReferencesDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/MultipleReferencesDescriptionItemProvider.java
index 61e56b6dda..78199cfeb1 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/MultipleReferencesDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/MultipleReferencesDescriptionItemProvider.java
@@ -29,7 +29,7 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.MultipleReferencesDescription} object.
  * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class MultipleReferencesDescriptionItemProvider extends WidgetDescriptionItemProvider {
@@ -93,7 +93,7 @@ public class MultipleReferencesDescriptionItemProvider extends WidgetDescription
      * {@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
@@ -112,7 +112,7 @@ public class MultipleReferencesDescriptionItemProvider extends WidgetDescription
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -127,7 +127,7 @@ public class MultipleReferencesDescriptionItemProvider extends WidgetDescription
     /**
      * This returns MultipleReferencesDescription.gif. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -138,7 +138,7 @@ public class MultipleReferencesDescriptionItemProvider extends WidgetDescription
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -152,7 +152,7 @@ public class MultipleReferencesDescriptionItemProvider extends WidgetDescription
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/OperationDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/OperationDescriptionItemProvider.java
index f89d57e1be..935cd4814e 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/OperationDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/OperationDescriptionItemProvider.java
@@ -71,7 +71,7 @@ IItemPropertySource {
      * {@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
@@ -85,7 +85,7 @@ IItemPropertySource {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -100,7 +100,7 @@ IItemPropertySource {
     /**
      * This returns OperationDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -111,7 +111,7 @@ IItemPropertySource {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -124,7 +124,7 @@ IItemPropertySource {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
index 2c1474a23c..b839d2be75 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
@@ -110,7 +110,7 @@ IItemPropertySource {
     /**
      * This adds a property descriptor for the Semantic Candidate Expression
      * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addSemanticCandidateExpressionPropertyDescriptor(Object object) {
@@ -139,7 +139,7 @@ IItemPropertySource {
      * {@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
@@ -153,7 +153,7 @@ IItemPropertySource {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -168,7 +168,7 @@ IItemPropertySource {
     /**
      * This returns PageDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -179,7 +179,7 @@ IItemPropertySource {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -193,7 +193,7 @@ IItemPropertySource {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java
index 8193b2f51d..54cabeba36 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java
@@ -34,7 +34,7 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.PageValidationSetDescription} object.
  * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class PageValidationSetDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
@@ -71,7 +71,7 @@ IItemPropertySource {
      * {@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
@@ -85,7 +85,7 @@ IItemPropertySource {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -100,7 +100,7 @@ IItemPropertySource {
     /**
      * This returns PageValidationSetDescription.gif. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -111,7 +111,7 @@ IItemPropertySource {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -124,7 +124,7 @@ IItemPropertySource {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java
index d21d33263e..454d712886 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java
@@ -41,7 +41,7 @@ public final class PropertiesEditPlugin extends EMFPlugin {
 
     /**
      * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public PropertiesEditPlugin() {
@@ -51,7 +51,7 @@ public final class PropertiesEditPlugin extends EMFPlugin {
     /**
      * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @return the singleton instance.
      * @generated
      */
@@ -63,7 +63,7 @@ public final class PropertiesEditPlugin extends EMFPlugin {
     /**
      * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @return the singleton instance.
      * @generated
      */
@@ -80,7 +80,7 @@ public final class PropertiesEditPlugin extends EMFPlugin {
     public static class Implementation extends EclipsePlugin {
         /**
          * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         public Implementation() {
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
index 44db2c6e7b..256203ad97 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
@@ -50,14 +50,14 @@ import org.eclipse.sirius.viewpoint.description.validation.util.ValidationSwitch
  * adapters also support Eclipse property sheets. Note that most of the adapters
  * are shared among multiple instances. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
     /**
      * This keeps track of the root adapter factory that delegates to this
      * adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ComposedAdapterFactory parentAdapterFactory;
@@ -75,7 +75,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of all the supported types checked by
      * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -98,7 +98,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.ViewExtensionDescription} instances.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ViewExtensionDescriptionItemProvider viewExtensionDescriptionItemProvider;
@@ -148,7 +148,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.PageValidationSetDescription}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected PageValidationSetDescriptionItemProvider pageValidationSetDescriptionItemProvider;
@@ -198,7 +198,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.GroupValidationSetDescription}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected GroupValidationSetDescriptionItemProvider groupValidationSetDescriptionItemProvider;
@@ -223,7 +223,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.PropertyValidationRule} instances.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected PropertyValidationRuleItemProvider propertyValidationRuleItemProvider;
@@ -248,7 +248,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.ContainerDescription} instances.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ContainerDescriptionItemProvider containerDescriptionItemProvider;
@@ -498,7 +498,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.SingleReferenceDescription}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected SingleReferenceDescriptionItemProvider singleReferenceDescriptionItemProvider;
@@ -523,7 +523,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.OperationDescription} instances.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected OperationDescriptionItemProvider operationDescriptionItemProvider;
@@ -548,7 +548,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.MultipleReferencesDescription}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected MultipleReferencesDescriptionItemProvider multipleReferencesDescriptionItemProvider;
@@ -645,6 +645,56 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.WidgetStyle} instances. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected WidgetStyleItemProvider widgetStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.WidgetStyle}. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createWidgetStyleAdapter() {
+        if (widgetStyleItemProvider == null) {
+            widgetStyleItemProvider = new WidgetStyleItemProvider(this);
+        }
+
+        return widgetStyleItemProvider;
+    }
+
+    /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.TextStyle} instances. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected TextStyleItemProvider textStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.TextStyle}. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createTextStyleAdapter() {
+        if (textStyleItemProvider == null) {
+            textStyleItemProvider = new TextStyleItemProvider(this);
+        }
+
+        return textStyleItemProvider;
+    }
+
+    /**
      * This returns the root adapter factory that contains this factory. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -668,7 +718,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -679,7 +729,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     /**
      * This implementation substitutes the factory itself as the key for the
      * adapter. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -689,7 +739,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -706,7 +756,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -716,7 +766,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -814,6 +864,12 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
         if (customOperationItemProvider != null) {
             customOperationItemProvider.dispose();
         }
+        if (widgetStyleItemProvider != null) {
+            widgetStyleItemProvider.dispose();
+        }
+        if (textStyleItemProvider != null) {
+            textStyleItemProvider.dispose();
+        }
     }
 
     /**
@@ -826,14 +882,14 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
         /**
          * The switch for creating child descriptors specific to each extended
          * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         protected static class CreationSwitch extends DescriptionSwitch<Object> {
             /**
              * The child descriptors being populated. <!-- begin-user-doc -->
              * <!-- end-user-doc -->
-             * 
+             *
              * @generated
              */
             protected List<Object> newChildDescriptors;
@@ -841,7 +897,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
             /**
              * The domain in which to create the children. <!-- begin-user-doc
              * --> <!-- end-user-doc -->
-             * 
+             *
              * @generated
              */
             protected EditingDomain editingDomain;
@@ -849,7 +905,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
             /**
              * Creates the a switch for populating child descriptors in the
              * given domain. <!-- begin-user-doc --> <!-- end-user-doc -->
-             * 
+             *
              * @generated
              */
             CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
@@ -859,7 +915,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
             /**
              * <!-- begin-user-doc --> <!-- end-user-doc -->
-             * 
+             *
              * @generated
              */
             @Override
@@ -871,7 +927,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
             /**
              * <!-- begin-user-doc --> <!-- end-user-doc -->
-             * 
+             *
              * @generated
              */
             protected CommandParameter createChildParameter(Object feature, Object child) {
@@ -882,7 +938,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         @Override
@@ -894,7 +950,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         @Override
@@ -913,14 +969,14 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
         /**
          * The switch for creating child descriptors specific to each extended
          * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         protected static class CreationSwitch extends ValidationSwitch<Object> {
             /**
              * The child descriptors being populated. <!-- begin-user-doc -->
              * <!-- end-user-doc -->
-             * 
+             *
              * @generated
              */
             protected List<Object> newChildDescriptors;
@@ -928,7 +984,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
             /**
              * The domain in which to create the children. <!-- begin-user-doc
              * --> <!-- end-user-doc -->
-             * 
+             *
              * @generated
              */
             protected EditingDomain editingDomain;
@@ -936,7 +992,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
             /**
              * Creates the a switch for populating child descriptors in the
              * given domain. <!-- begin-user-doc --> <!-- end-user-doc -->
-             * 
+             *
              * @generated
              */
             CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
@@ -946,7 +1002,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
             /**
              * <!-- begin-user-doc --> <!-- end-user-doc -->
-             * 
+             *
              * @generated
              */
             @Override
@@ -958,7 +1014,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
             /**
              * <!-- begin-user-doc --> <!-- end-user-doc -->
-             * 
+             *
              * @generated
              */
             protected CommandParameter createChildParameter(Object feature, Object child) {
@@ -969,7 +1025,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         @Override
@@ -981,7 +1037,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java
index 78d9189ba8..d2ca6eeb4f 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java
@@ -73,7 +73,7 @@ public class PropertyValidationRuleItemProvider extends ValidationRuleItemProvid
     /**
      * This returns PropertyValidationRule.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -84,7 +84,7 @@ public class PropertyValidationRuleItemProvider extends ValidationRuleItemProvid
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -98,7 +98,7 @@ public class PropertyValidationRuleItemProvider extends ValidationRuleItemProvid
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java
index a04da70cbd..af76c16779 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java
@@ -77,7 +77,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This adds a property descriptor for the Candidates Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addCandidatesExpressionPropertyDescriptor(Object object) {
@@ -90,7 +90,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This adds a property descriptor for the Candidate Display Expression
      * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addCandidateDisplayExpressionPropertyDescriptor(Object object) {
@@ -107,7 +107,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
      * {@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
@@ -121,7 +121,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -136,7 +136,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns RadioDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -147,7 +147,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -161,7 +161,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
index 7d8a0920c7..16f2c84a3c 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
@@ -77,7 +77,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This adds a property descriptor for the Candidates Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addCandidatesExpressionPropertyDescriptor(Object object) {
@@ -90,7 +90,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This adds a property descriptor for the Candidate Display Expression
      * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addCandidateDisplayExpressionPropertyDescriptor(Object object) {
@@ -107,7 +107,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
      * {@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
@@ -121,7 +121,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -136,7 +136,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns SelectDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -147,7 +147,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -161,7 +161,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SingleReferenceDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SingleReferenceDescriptionItemProvider.java
index c12b98e18d..381c635862 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SingleReferenceDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SingleReferenceDescriptionItemProvider.java
@@ -93,7 +93,7 @@ public class SingleReferenceDescriptionItemProvider extends WidgetDescriptionIte
      * {@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
@@ -110,7 +110,7 @@ public class SingleReferenceDescriptionItemProvider extends WidgetDescriptionIte
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -125,7 +125,7 @@ public class SingleReferenceDescriptionItemProvider extends WidgetDescriptionIte
     /**
      * This returns SingleReferenceDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -136,7 +136,7 @@ public class SingleReferenceDescriptionItemProvider extends WidgetDescriptionIte
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -150,7 +150,7 @@ public class SingleReferenceDescriptionItemProvider extends WidgetDescriptionIte
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java
index 13f3e4d304..b25a9692b0 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java
@@ -72,7 +72,7 @@ public class TextAreaDescriptionItemProvider extends TextDescriptionItemProvider
     /**
      * This returns TextAreaDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -83,7 +83,7 @@ public class TextAreaDescriptionItemProvider extends TextDescriptionItemProvider
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -97,7 +97,7 @@ public class TextAreaDescriptionItemProvider extends TextDescriptionItemProvider
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
index dcc7e1a16d..88ed7b7075 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
@@ -21,6 +21,7 @@ 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.TextDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
@@ -78,7 +79,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
      * {@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
@@ -86,13 +87,14 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
         if (childrenFeatures == null) {
             super.getChildrenFeatures(object);
             childrenFeatures.add(PropertiesPackage.Literals.TEXT_DESCRIPTION__INITIAL_OPERATION);
+            childrenFeatures.add(PropertiesPackage.Literals.TEXT_DESCRIPTION__STYLE);
         }
         return childrenFeatures;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -107,7 +109,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     /**
      * This returns TextDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -118,7 +120,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -132,7 +134,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -144,6 +146,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
             return;
         case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
+        case PropertiesPackage.TEXT_DESCRIPTION__STYLE:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
             return;
         }
@@ -162,6 +165,8 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createTextStyle()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextStyleItemProvider.java
new file mode 100644
index 0000000000..1d22cadf2b
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextStyleItemProvider.java
@@ -0,0 +1,180 @@
+/**
+ * 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.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.PropertiesPackage;
+import org.eclipse.sirius.properties.TextStyle;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.TextStyle} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class TextStyleItemProvider extends WidgetStyleItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public TextStyleItemProvider(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);
+
+            addFontNameExpressionPropertyDescriptor(object);
+            addFontSizePropertyDescriptor(object);
+            addBackgroundColorPropertyDescriptor(object);
+            addForegroundColorPropertyDescriptor(object);
+            addFontFormatPropertyDescriptor(object);
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This adds a property descriptor for the Font Name Expression feature.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addFontNameExpressionPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_TextStyle_fontNameExpression_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextStyle_fontNameExpression_feature", "_UI_TextStyle_type"),
+                PropertiesPackage.Literals.TEXT_STYLE__FONT_NAME_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Font Size feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addFontSizePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_TextStyle_fontSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextStyle_fontSize_feature", "_UI_TextStyle_type"),
+                PropertiesPackage.Literals.TEXT_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Background Color feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addBackgroundColorPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_TextStyle_backgroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextStyle_backgroundColor_feature", "_UI_TextStyle_type"),
+                PropertiesPackage.Literals.TEXT_STYLE__BACKGROUND_COLOR, true, false, true, null, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Foreground Color feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addForegroundColorPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_TextStyle_foregroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextStyle_foregroundColor_feature", "_UI_TextStyle_type"),
+                PropertiesPackage.Literals.TEXT_STYLE__FOREGROUND_COLOR, true, false, true, null, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Font Format feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addFontFormatPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_TextStyle_fontFormat_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextStyle_fontFormat_feature", "_UI_TextStyle_type"),
+                PropertiesPackage.Literals.TEXT_STYLE__FONT_FORMAT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This returns TextStyle.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TextStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((TextStyle) object).getFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_TextStyle_type") : getString("_UI_TextStyle_type") + " " + label;
+    }
+
+    /**
+     * 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(TextStyle.class)) {
+        case PropertiesPackage.TEXT_STYLE__FONT_NAME_EXPRESSION:
+        case PropertiesPackage.TEXT_STYLE__FONT_SIZE:
+        case PropertiesPackage.TEXT_STYLE__FONT_FORMAT:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            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);
+    }
+
+}
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
index 0ba258e42e..9e98db82b8 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
@@ -101,7 +101,7 @@ IItemPropertySource {
      * {@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
@@ -116,7 +116,7 @@ IItemPropertySource {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -131,7 +131,7 @@ IItemPropertySource {
     /**
      * This returns ViewExtensionDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -142,7 +142,7 @@ IItemPropertySource {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -156,7 +156,7 @@ IItemPropertySource {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
index b524e18a36..9c2fbe97ff 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
@@ -108,7 +108,7 @@ IItemPropertySource {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -122,7 +122,7 @@ IItemPropertySource {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java
new file mode 100644
index 0000000000..d3d3c7bb4e
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java
@@ -0,0 +1,121 @@
+/**
+ * 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.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.WidgetStyle} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class WidgetStyleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+IItemPropertySource {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public WidgetStyleItemProvider(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 WidgetStyle.gif. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/WidgetStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        return getString("_UI_WidgetStyle_type");
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * Return the resource locator for this item provider's resources. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public ResourceLocator getResourceLocator() {
+        return PropertiesEditPlugin.INSTANCE;
+    }
+
+}
diff --git a/incubation/org.eclipse.sirius.properties/model/properties.ecore b/incubation/org.eclipse.sirius.properties/model/properties.ecore
index 6919e41339..dbe16b4aac 100644
--- a/incubation/org.eclipse.sirius.properties/model/properties.ecore
+++ b/incubation/org.eclipse.sirius.properties/model/properties.ecore
@@ -71,6 +71,8 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="initialOperation" lowerBound="1"
         eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/InitialOperation"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//TextStyle"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ButtonDescription" eSuperTypes="#//WidgetDescription">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="buttonLabelExpression"
@@ -254,4 +256,13 @@
         eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/InitialOperation"
         containment="true"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="WidgetStyle"/>
+  <eClassifiers xsi:type="ecore:EClass" name="TextStyle" eSuperTypes="#//WidgetStyle">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontNameExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontSize" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="backgroundColor" eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/ColorDescription"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="foregroundColor" eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/ColorDescription"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontFormat" upperBound="4"
+        eType="ecore:EEnum ../../org.eclipse.sirius/model/viewpoint.ecore#//FontFormat"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/incubation/org.eclipse.sirius.properties/model/properties.genmodel b/incubation/org.eclipse.sirius.properties/model/properties.genmodel
index d0b9fa2a62..c6c3895f77 100644
--- a/incubation/org.eclipse.sirius.properties/model/properties.genmodel
+++ b/incubation/org.eclipse.sirius.properties/model/properties.genmodel
@@ -58,6 +58,7 @@
     <genClasses ecoreClass="properties.ecore#//TextDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//TextDescription/valueExpression"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//TextDescription/initialOperation"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//TextDescription/style"/>
     </genClasses>
     <genClasses ecoreClass="properties.ecore#//ButtonDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//ButtonDescription/buttonLabelExpression"/>
@@ -127,5 +128,13 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//CustomOperation/identifier"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CustomOperation/initialOperation"/>
     </genClasses>
+    <genClasses ecoreClass="properties.ecore#//WidgetStyle"/>
+    <genClasses ecoreClass="properties.ecore#//TextStyle">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//TextStyle/fontNameExpression"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//TextStyle/fontSize"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference properties.ecore#//TextStyle/backgroundColor"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference properties.ecore#//TextStyle/foregroundColor"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//TextStyle/fontFormat"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonDescription.java
index 2e7bddf5eb..2263aa80fa 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonDescription.java
@@ -42,7 +42,7 @@ public interface ButtonDescription extends WidgetDescription {
      * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Button Label Expression</em>' attribute.
      * @see #setButtonLabelExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getButtonDescription_ButtonLabelExpression()
@@ -57,7 +57,7 @@ public interface ButtonDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.ButtonDescription#getButtonLabelExpression
      * <em>Button Label Expression</em>}' attribute. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Button Label Expression</em>'
      *            attribute.
@@ -74,7 +74,7 @@ public interface ButtonDescription extends WidgetDescription {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Initial Operation</em>' containment
      *         reference.
      * @see #setInitialOperation(InitialOperation)
@@ -89,7 +89,7 @@ public interface ButtonDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.ButtonDescription#getInitialOperation
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Initial Operation</em>' containment
      *            reference.
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java
index 983f6636b3..64f62e808b 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java
@@ -42,7 +42,7 @@ public interface CheckboxDescription extends WidgetDescription {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Value Expression</em>' attribute.
      * @see #setValueExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getCheckboxDescription_ValueExpression()
@@ -57,7 +57,7 @@ public interface CheckboxDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.CheckboxDescription#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()
@@ -73,7 +73,7 @@ public interface CheckboxDescription extends WidgetDescription {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Initial Operation</em>' containment
      *         reference.
      * @see #setInitialOperation(InitialOperation)
@@ -88,7 +88,7 @@ public interface CheckboxDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.CheckboxDescription#getInitialOperation
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Initial Operation</em>' containment
      *            reference.
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java
index 7cf5d2d1f5..e97069f536 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java
@@ -58,7 +58,7 @@ public interface ContainerDescription extends EObject {
      * {@link org.eclipse.sirius.properties.ContainerDescription#getIdentifier
      * <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomExpression.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomExpression.java
index e2325523c1..6c4d83e408 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomExpression.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomExpression.java
@@ -55,7 +55,7 @@ public interface CustomExpression extends EObject {
      * {@link org.eclipse.sirius.properties.CustomExpression#getIdentifier
      * <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
@@ -71,7 +71,7 @@ public interface CustomExpression extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Custom Expression</em>' attribute.
      * @see #setCustomExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getCustomExpression_CustomExpression()
@@ -86,7 +86,7 @@ public interface CustomExpression extends EObject {
      * {@link org.eclipse.sirius.properties.CustomExpression#getCustomExpression
      * <em>Custom Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Custom Expression</em>' attribute.
      * @see #getCustomExpression()
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomOperation.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomOperation.java
index 71ee9d51a4..5bc1945c46 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomOperation.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomOperation.java
@@ -55,7 +55,7 @@ public interface CustomOperation extends EObject {
      * {@link org.eclipse.sirius.properties.CustomOperation#getIdentifier
      * <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
@@ -71,7 +71,7 @@ public interface CustomOperation extends EObject {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Initial Operation</em>' containment
      *         reference.
      * @see #setInitialOperation(InitialOperation)
@@ -86,7 +86,7 @@ public interface CustomOperation extends EObject {
      * {@link org.eclipse.sirius.properties.CustomOperation#getInitialOperation
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Initial Operation</em>' containment
      *            reference.
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java
index 3bac07a604..ccbefe8f7a 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java
@@ -74,7 +74,7 @@ public interface DynamicMappingFor extends EObject {
      * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Domain Class Expression</em>' attribute.
      * @see #setDomainClassExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getDynamicMappingFor_DomainClassExpression()
@@ -88,7 +88,7 @@ public interface DynamicMappingFor extends EObject {
      * {@link org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression
      * <em>Domain Class Expression</em>}' attribute. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Domain Class Expression</em>'
      *            attribute.
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingIf.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingIf.java
index 1e17d228d7..3289383380 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingIf.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingIf.java
@@ -41,7 +41,7 @@ public interface DynamicMappingIf extends EObject {
      * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Predicate Expression</em>' attribute.
      * @see #setPredicateExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getDynamicMappingIf_PredicateExpression()
@@ -55,7 +55,7 @@ public interface DynamicMappingIf extends EObject {
      * {@link org.eclipse.sirius.properties.DynamicMappingIf#getPredicateExpression
      * <em>Predicate Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Predicate Expression</em>'
      *            attribute.
@@ -72,7 +72,7 @@ public interface DynamicMappingIf extends EObject {
      * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Widget</em>' containment reference.
      * @see #setWidget(WidgetDescription)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getDynamicMappingIf_Widget()
@@ -86,7 +86,7 @@ public interface DynamicMappingIf extends EObject {
      * {@link org.eclipse.sirius.properties.DynamicMappingIf#getWidget
      * <em>Widget</em>}' containment reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Widget</em>' containment reference.
      * @see #getWidget()
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java
index e9dc2c01f6..e2a3f5d760 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java
@@ -63,7 +63,7 @@ public interface GroupDescription extends EObject {
      * {@link org.eclipse.sirius.properties.GroupDescription#getIdentifier
      * <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
@@ -79,7 +79,7 @@ public interface GroupDescription extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Label Expression</em>' attribute.
      * @see #setLabelExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupDescription_LabelExpression()
@@ -94,7 +94,7 @@ public interface GroupDescription extends EObject {
      * {@link org.eclipse.sirius.properties.GroupDescription#getLabelExpression
      * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Label Expression</em>' attribute.
      * @see #getLabelExpression()
@@ -124,7 +124,7 @@ public interface GroupDescription extends EObject {
      * {@link org.eclipse.sirius.properties.GroupDescription#getDomainClass
      * <em>Domain Class</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Domain Class</em>' attribute.
      * @see #getDomainClass()
@@ -140,7 +140,7 @@ public interface GroupDescription extends EObject {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Semantic Candidate Expression</em>'
      *         attribute.
      * @see #setSemanticCandidateExpression(String)
@@ -156,7 +156,7 @@ public interface GroupDescription extends EObject {
      * {@link org.eclipse.sirius.properties.GroupDescription#getSemanticCandidateExpression
      * <em>Semantic Candidate Expression</em>}' attribute. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Semantic Candidate Expression</em>'
      *            attribute.
@@ -173,7 +173,7 @@ public interface GroupDescription extends EObject {
      * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Container</em>' containment reference.
      * @see #setContainer(ContainerDescription)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupDescription_Container()
@@ -187,7 +187,7 @@ public interface GroupDescription extends EObject {
      * {@link org.eclipse.sirius.properties.GroupDescription#getContainer
      * <em>Container</em>}' containment reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Container</em>' containment
      *            reference.
@@ -204,7 +204,7 @@ public interface GroupDescription extends EObject {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Validation Set</em>' containment reference.
      * @see #setValidationSet(GroupValidationSetDescription)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupDescription_ValidationSet()
@@ -218,7 +218,7 @@ public interface GroupDescription extends EObject {
      * {@link org.eclipse.sirius.properties.GroupDescription#getValidationSet
      * <em>Validation Set</em>}' containment reference. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Validation Set</em>' containment
      *            reference.
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupValidationSetDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupValidationSetDescription.java
index e65d206e17..28e7c8f358 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupValidationSetDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupValidationSetDescription.java
@@ -47,7 +47,7 @@ public interface GroupValidationSetDescription extends EObject {
      * here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Semantic Validation Rules</em>' containment
      *         reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupValidationSetDescription_SemanticValidationRules()
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelDescription.java
index 130c34cc34..0295b15c80 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelDescription.java
@@ -36,7 +36,7 @@ public interface LabelDescription extends WidgetDescription {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Body Expression</em>' attribute.
      * @see #setBodyExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getLabelDescription_BodyExpression()
@@ -51,7 +51,7 @@ public interface LabelDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.LabelDescription#getBodyExpression
      * <em>Body Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Body Expression</em>' attribute.
      * @see #getBodyExpression()
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/MultipleReferencesDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/MultipleReferencesDescription.java
index 5e609fb53a..e612ca1c35 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/MultipleReferencesDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/MultipleReferencesDescription.java
@@ -72,7 +72,7 @@ public interface MultipleReferencesDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#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()
@@ -99,7 +99,7 @@ public interface MultipleReferencesDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#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()
@@ -115,7 +115,7 @@ public interface MultipleReferencesDescription extends WidgetDescription {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Create Operation</em>' containment
      *         reference.
      * @see #setCreateOperation(OperationDescription)
@@ -130,7 +130,7 @@ public interface MultipleReferencesDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getCreateOperation
      * <em>Create Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Create Operation</em>' containment
      *            reference.
@@ -147,7 +147,7 @@ public interface MultipleReferencesDescription extends WidgetDescription {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Search Operation</em>' containment
      *         reference.
      * @see #setSearchOperation(OperationDescription)
@@ -162,7 +162,7 @@ public interface MultipleReferencesDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getSearchOperation
      * <em>Search Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Search Operation</em>' containment
      *            reference.
@@ -179,7 +179,7 @@ public interface MultipleReferencesDescription extends WidgetDescription {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Unset Operation</em>' containment
      *         reference.
      * @see #setUnsetOperation(OperationDescription)
@@ -194,7 +194,7 @@ public interface MultipleReferencesDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getUnsetOperation
      * <em>Unset Operation</em>}' containment reference. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Unset Operation</em>' containment
      *            reference.
@@ -211,7 +211,7 @@ public interface MultipleReferencesDescription extends WidgetDescription {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>On Click Operation</em>' containment
      *         reference.
      * @see #setOnClickOperation(OperationDescription)
@@ -226,7 +226,7 @@ public interface MultipleReferencesDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#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.
@@ -243,7 +243,7 @@ public interface MultipleReferencesDescription extends WidgetDescription {
      * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Up Operation</em>' containment reference.
      * @see #setUpOperation(OperationDescription)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getMultipleReferencesDescription_UpOperation()
@@ -257,7 +257,7 @@ public interface MultipleReferencesDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getUpOperation
      * <em>Up Operation</em>}' containment reference. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Up Operation</em>' containment
      *            reference.
@@ -274,7 +274,7 @@ public interface MultipleReferencesDescription extends WidgetDescription {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Down Operation</em>' containment reference.
      * @see #setDownOperation(OperationDescription)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getMultipleReferencesDescription_DownOperation()
@@ -288,7 +288,7 @@ public interface MultipleReferencesDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getDownOperation
      * <em>Down Operation</em>}' containment reference. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Down Operation</em>' containment
      *            reference.
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/OperationDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/OperationDescription.java
index 4d8631d787..345bf8951a 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/OperationDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/OperationDescription.java
@@ -40,7 +40,7 @@ public interface OperationDescription extends EObject {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Initial Operation</em>' containment
      *         reference.
      * @see #setInitialOperation(InitialOperation)
@@ -55,7 +55,7 @@ public interface OperationDescription extends EObject {
      * {@link org.eclipse.sirius.properties.OperationDescription#getInitialOperation
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Initial Operation</em>' containment
      *            reference.
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java
index 4178b2ea45..61659fe260 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java
@@ -64,7 +64,7 @@ public interface PageDescription extends EObject {
      * {@link org.eclipse.sirius.properties.PageDescription#getIdentifier
      * <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
@@ -80,7 +80,7 @@ public interface PageDescription extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Label Expression</em>' attribute.
      * @see #setLabelExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getPageDescription_LabelExpression()
@@ -95,7 +95,7 @@ public interface PageDescription extends EObject {
      * {@link org.eclipse.sirius.properties.PageDescription#getLabelExpression
      * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Label Expression</em>' attribute.
      * @see #getLabelExpression()
@@ -125,7 +125,7 @@ public interface PageDescription extends EObject {
      * {@link org.eclipse.sirius.properties.PageDescription#getDomainClass
      * <em>Domain Class</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Domain Class</em>' attribute.
      * @see #getDomainClass()
@@ -141,7 +141,7 @@ public interface PageDescription extends EObject {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Semantic Candidate Expression</em>'
      *         attribute.
      * @see #setSemanticCandidateExpression(String)
@@ -157,7 +157,7 @@ public interface PageDescription extends EObject {
      * {@link org.eclipse.sirius.properties.PageDescription#getSemanticCandidateExpression
      * <em>Semantic Candidate Expression</em>}' attribute. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Semantic Candidate Expression</em>'
      *            attribute.
@@ -192,7 +192,7 @@ public interface PageDescription extends EObject {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Validation Set</em>' containment reference.
      * @see #setValidationSet(PageValidationSetDescription)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getPageDescription_ValidationSet()
@@ -206,7 +206,7 @@ public interface PageDescription extends EObject {
      * {@link org.eclipse.sirius.properties.PageDescription#getValidationSet
      * <em>Validation Set</em>}' containment reference. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Validation Set</em>' containment
      *            reference.
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageValidationSetDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageValidationSetDescription.java
index cab6ecd20b..aa8404c86a 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageValidationSetDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageValidationSetDescription.java
@@ -44,7 +44,7 @@ public interface PageValidationSetDescription extends EObject {
      * here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Semantic Validation Rules</em>' containment
      *         reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getPageValidationSetDescription_SemanticValidationRules()
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
index 06ef1e20a2..20af490939 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
  * create method for each non-abstract class of the model. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.sirius.properties.PropertiesPackage
  * @generated
  */
@@ -24,7 +24,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * The singleton instance of the factory. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     PropertiesFactory eINSTANCE = org.eclipse.sirius.properties.impl.PropertiesFactoryImpl.init();
@@ -50,7 +50,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Page Validation Set Description</em>'.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Page Validation Set Description</em>'.
      * @generated
      */
@@ -77,7 +77,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Group Validation Set Description</em>
      * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Group Validation Set Description</em>
      *         '.
      * @generated
@@ -177,7 +177,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Single Reference Description</em>'.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Single Reference Description</em>'.
      * @generated
      */
@@ -195,7 +195,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Multiple References Description</em>'.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Multiple References Description</em>'.
      * @generated
      */
@@ -229,9 +229,27 @@ public interface PropertiesFactory extends EFactory {
     CustomOperation createCustomOperation();
 
     /**
+     * Returns a new object of class '<em>Widget Style</em>'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Widget Style</em>'.
+     * @generated
+     */
+    WidgetStyle createWidgetStyle();
+
+    /**
+     * Returns a new object of class '<em>Text Style</em>'. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Text Style</em>'.
+     * @generated
+     */
+    TextStyle createTextStyle();
+
+    /**
      * Returns the package supported by this factory. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the package supported by this factory.
      * @generated
      */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
index 5fe2ca377c..3c0844a283 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
@@ -28,7 +28,7 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.sirius.properties.PropertiesFactory
  * @model kind="package"
  * @generated
@@ -36,21 +36,21 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 public interface PropertiesPackage extends EPackage {
     /**
      * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     String eNAME = "properties";
 
     /**
      * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     String eNS_URI = "http://www.eclipse.org/sirius/properties/1.0.0";
 
     /**
      * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     String eNS_PREFIX = "properties";
@@ -58,7 +58,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The singleton instance of the package. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     PropertiesPackage eINSTANCE = org.eclipse.sirius.properties.impl.PropertiesPackageImpl.init();
@@ -68,7 +68,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl
      * <em>View Extension Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getViewExtensionDescription()
      * @generated
@@ -96,7 +96,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Pages</b></em>' containment reference
      * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -105,7 +105,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Groups</b></em>' containment reference
      * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -115,7 +115,7 @@ public interface PropertiesPackage extends EPackage {
      * The number of structural features of the '
      * <em>View Extension Description</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -126,7 +126,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.PageDescriptionImpl
      * <em>Page Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.PageDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getPageDescription()
      * @generated
@@ -163,7 +163,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Semantic Candidate Expression</b></em>'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -181,7 +181,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Validation Set</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -190,7 +190,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Page Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -201,7 +201,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.PageValidationSetDescriptionImpl
      * <em>Page Validation Set Description</em>}' class. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.PageValidationSetDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getPageValidationSetDescription()
      * @generated
@@ -211,7 +211,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Semantic Validation Rules</b></em>'
      * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -221,7 +221,7 @@ public interface PropertiesPackage extends EPackage {
      * The number of structural features of the '
      * <em>Page Validation Set Description</em>' class. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -232,7 +232,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.PropertyValidationRuleImpl
      * <em>Property Validation Rule</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.PropertyValidationRuleImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getPropertyValidationRule()
      * @generated
@@ -278,7 +278,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Audits</b></em>' containment reference
      * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -287,7 +287,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Fixes</b></em>' containment reference
      * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -306,7 +306,7 @@ public interface PropertiesPackage extends EPackage {
      * The number of structural features of the '
      * <em>Property Validation Rule</em>' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -317,7 +317,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl
      * <em>Group Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.GroupDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getGroupDescription()
      * @generated
@@ -354,7 +354,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Semantic Candidate Expression</b></em>'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -363,7 +363,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Container</b></em>' containment reference.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -372,7 +372,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Validation Set</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -381,7 +381,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Group Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -392,7 +392,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.GroupValidationSetDescriptionImpl
      * <em>Group Validation Set Description</em>}' class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.GroupValidationSetDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getGroupValidationSetDescription()
      * @generated
@@ -402,7 +402,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Semantic Validation Rules</b></em>'
      * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -411,7 +411,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Property Validation Rules</b></em>'
      * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -421,7 +421,7 @@ public interface PropertiesPackage extends EPackage {
      * The number of structural features of the '
      * <em>Group Validation Set Description</em>' class. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -432,7 +432,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl
      * <em>Container Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.ContainerDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getContainerDescription()
      * @generated
@@ -451,7 +451,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Widgets</b></em>' containment reference
      * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -460,7 +460,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Dynamic Mappings</b></em>' containment
      * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -469,7 +469,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Container Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -480,7 +480,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl
      * <em>Widget Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.WidgetDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getWidgetDescription()
      * @generated
@@ -517,7 +517,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Widget Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -528,7 +528,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.TextDescriptionImpl
      * <em>Text Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.TextDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextDescription()
      * @generated
@@ -574,27 +574,36 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
     int TEXT_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
 
     /**
+     * The feature id for the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_DESCRIPTION__STYLE = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+
+    /**
      * The number of structural features of the '<em>Text Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int TEXT_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+    int TEXT_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
 
     /**
      * The meta object id for the '
      * {@link org.eclipse.sirius.properties.impl.ButtonDescriptionImpl
      * <em>Button Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.ButtonDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getButtonDescription()
      * @generated
@@ -631,7 +640,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Button Label Expression</b></em>'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -640,7 +649,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -649,7 +658,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Button Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -660,7 +669,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.LabelDescriptionImpl
      * <em>Label Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.LabelDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getLabelDescription()
      * @generated
@@ -706,7 +715,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Label Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -717,7 +726,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl
      * <em>Checkbox Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCheckboxDescription()
      * @generated
@@ -763,7 +772,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -772,7 +781,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Checkbox Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -783,7 +792,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl
      * <em>Select Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.SelectDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSelectDescription()
      * @generated
@@ -829,7 +838,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -838,7 +847,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Candidates Expression</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -847,7 +856,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Candidate Display Expression</b></em>'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -856,7 +865,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Select Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -867,7 +876,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl
      * <em>Dynamic Mapping For</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.DynamicMappingForImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getDynamicMappingFor()
      * @generated
@@ -886,7 +895,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Domain Class Expression</b></em>'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -895,7 +904,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Ifs</b></em>' containment reference list.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -904,7 +913,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Dynamic Mapping For</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -915,7 +924,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.DynamicMappingIfImpl
      * <em>Dynamic Mapping If</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.DynamicMappingIfImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getDynamicMappingIf()
      * @generated
@@ -925,7 +934,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Predicate Expression</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -934,7 +943,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Widget</b></em>' containment reference.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -943,7 +952,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Dynamic Mapping If</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -954,7 +963,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.TextAreaDescriptionImpl
      * <em>Text Area Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.TextAreaDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextAreaDescription()
      * @generated
@@ -1000,13 +1009,22 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
     int TEXT_AREA_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION;
 
     /**
+     * The feature id for the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_AREA_DESCRIPTION__STYLE = PropertiesPackage.TEXT_DESCRIPTION__STYLE;
+
+    /**
      * The feature id for the '<em><b>Line Count</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -1018,7 +1036,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Text Area Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1029,7 +1047,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.RadioDescriptionImpl
      * <em>Radio Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.RadioDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getRadioDescription()
      * @generated
@@ -1075,7 +1093,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1084,7 +1102,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Candidates Expression</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1093,7 +1111,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Candidate Display Expression</b></em>'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1102,7 +1120,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Radio Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1113,7 +1131,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.SingleReferenceDescriptionImpl
      * <em>Single Reference Description</em>}' class. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.SingleReferenceDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSingleReferenceDescription()
      * @generated
@@ -1159,7 +1177,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Display Expression</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1168,7 +1186,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Create Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1177,7 +1195,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Search Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1186,7 +1204,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Unset Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1195,7 +1213,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>On Click Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1205,7 +1223,7 @@ public interface PropertiesPackage extends EPackage {
      * The number of structural features of the '
      * <em>Single Reference Description</em>' class. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1216,7 +1234,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.OperationDescriptionImpl
      * <em>Operation Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.OperationDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getOperationDescription()
      * @generated
@@ -1226,7 +1244,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1235,7 +1253,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Operation Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1246,7 +1264,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.CustomDescriptionImpl
      * <em>Custom Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.CustomDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomDescription()
      * @generated
@@ -1258,7 +1276,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.CustomExpressionImpl
      * <em>Custom Expression</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.CustomExpressionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomExpression()
      * @generated
@@ -1270,7 +1288,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.CustomOperationImpl
      * <em>Custom Operation</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.CustomOperationImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomOperation()
      * @generated
@@ -1282,7 +1300,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.impl.MultipleReferencesDescriptionImpl
      * <em>Multiple References Description</em>}' class. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.sirius.properties.impl.MultipleReferencesDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getMultipleReferencesDescription()
      * @generated
@@ -1328,7 +1346,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Display Expression</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1337,7 +1355,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Create Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1346,7 +1364,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Search Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1355,7 +1373,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Unset Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1364,7 +1382,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>On Click Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1373,7 +1391,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Up Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1382,7 +1400,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Down Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1392,7 +1410,7 @@ public interface PropertiesPackage extends EPackage {
      * The number of structural features of the '
      * <em>Multiple References Description</em>' class. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1428,7 +1446,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Custom Expressions</b></em>' containment
      * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1437,7 +1455,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Custom Operations</b></em>' containment
      * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1446,7 +1464,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Custom Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1464,7 +1482,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Custom Expression</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1473,7 +1491,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Custom Expression</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1491,7 +1509,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment
      * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1500,18 +1518,105 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The number of structural features of the '<em>Custom Operation</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
     int CUSTOM_OPERATION_FEATURE_COUNT = 2;
 
     /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.WidgetStyleImpl
+     * <em>Widget Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @see org.eclipse.sirius.properties.impl.WidgetStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getWidgetStyle()
+     * @generated
+     */
+    int WIDGET_STYLE = 23;
+
+    /**
+     * The number of structural features of the '<em>Widget Style</em>' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int WIDGET_STYLE_FEATURE_COUNT = 0;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.TextStyleImpl
+     * <em>Text Style</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @see org.eclipse.sirius.properties.impl.TextStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextStyle()
+     * @generated
+     */
+    int TEXT_STYLE = 24;
+
+    /**
+     * The feature id for the '<em><b>Font Name Expression</b></em>' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_STYLE__FONT_NAME_EXPRESSION = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 0;
+
+    /**
+     * The feature id for the '<em><b>Font Size</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_STYLE__FONT_SIZE = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 1;
+
+    /**
+     * The feature id for the '<em><b>Background Color</b></em>' reference. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_STYLE__BACKGROUND_COLOR = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 2;
+
+    /**
+     * The feature id for the '<em><b>Foreground Color</b></em>' reference. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_STYLE__FOREGROUND_COLOR = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 3;
+
+    /**
+     * The feature id for the '<em><b>Font Format</b></em>' attribute list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_STYLE__FONT_FORMAT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 4;
+
+    /**
+     * The number of structural features of the '<em>Text Style</em>' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 5;
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.ViewExtensionDescription
      * <em>View Extension Description</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>View Extension Description</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription
      * @generated
@@ -1522,7 +1627,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getIdentifier
      * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getIdentifier()
      * @see #getViewExtensionDescription()
@@ -1534,7 +1639,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the reference list '
      * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getMetamodels
      * <em>Metamodels</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the reference list '<em>Metamodels</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getMetamodels()
      * @see #getViewExtensionDescription()
@@ -1546,7 +1651,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the containment reference list '
      * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getPages
      * <em>Pages</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference list '
      *         <em>Pages</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getPages()
@@ -1559,7 +1664,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the containment reference list '
      * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getGroups
      * <em>Groups</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference list '
      *         <em>Groups</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getGroups()
@@ -1584,7 +1689,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.properties.PageDescription#getIdentifier
      * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getIdentifier()
      * @see #getPageDescription()
@@ -1609,7 +1714,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.properties.PageDescription#getDomainClass
      * <em>Domain Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Domain Class</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getDomainClass()
      * @see #getPageDescription()
@@ -1622,7 +1727,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.PageDescription#getSemanticCandidateExpression
      * <em>Semantic Candidate Expression</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '
      *         <em>Semantic Candidate Expression</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getSemanticCandidateExpression()
@@ -1635,7 +1740,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the reference list '
      * {@link org.eclipse.sirius.properties.PageDescription#getGroups
      * <em>Groups</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the reference list '<em>Groups</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getGroups()
      * @see #getPageDescription()
@@ -1647,7 +1752,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the containment reference '
      * {@link org.eclipse.sirius.properties.PageDescription#getValidationSet
      * <em>Validation Set</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference '
      *         <em>Validation Set</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getValidationSet()
@@ -1661,7 +1766,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.PageValidationSetDescription
      * <em>Page Validation Set Description</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '
      *         <em>Page Validation Set Description</em>'.
      * @see org.eclipse.sirius.properties.PageValidationSetDescription
@@ -1674,7 +1779,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.PageValidationSetDescription#getSemanticValidationRules
      * <em>Semantic Validation Rules</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference list '
      *         <em>Semantic Validation Rules</em>'.
      * @see org.eclipse.sirius.properties.PageValidationSetDescription#getSemanticValidationRules()
@@ -1688,7 +1793,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.PropertyValidationRule
      * <em>Property Validation Rule</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Property Validation Rule</em>'.
      * @see org.eclipse.sirius.properties.PropertyValidationRule
      * @generated
@@ -1699,7 +1804,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the reference list '
      * {@link org.eclipse.sirius.properties.PropertyValidationRule#getTargets
      * <em>Targets</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the reference list '<em>Targets</em>'.
      * @see org.eclipse.sirius.properties.PropertyValidationRule#getTargets()
      * @see #getPropertyValidationRule()
@@ -1723,7 +1828,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.properties.GroupDescription#getIdentifier
      * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription#getIdentifier()
      * @see #getGroupDescription()
@@ -1748,7 +1853,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.properties.GroupDescription#getDomainClass
      * <em>Domain Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Domain Class</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription#getDomainClass()
      * @see #getGroupDescription()
@@ -1761,7 +1866,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.GroupDescription#getSemanticCandidateExpression
      * <em>Semantic Candidate Expression</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '
      *         <em>Semantic Candidate Expression</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription#getSemanticCandidateExpression()
@@ -1774,7 +1879,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the containment reference '
      * {@link org.eclipse.sirius.properties.GroupDescription#getContainer
      * <em>Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference '<em>Container</em>
      *         '.
      * @see org.eclipse.sirius.properties.GroupDescription#getContainer()
@@ -1787,7 +1892,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the containment reference '
      * {@link org.eclipse.sirius.properties.GroupDescription#getValidationSet
      * <em>Validation Set</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference '
      *         <em>Validation Set</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription#getValidationSet()
@@ -1801,7 +1906,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.GroupValidationSetDescription
      * <em>Group Validation Set Description</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '
      *         <em>Group Validation Set Description</em>'.
      * @see org.eclipse.sirius.properties.GroupValidationSetDescription
@@ -1814,7 +1919,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.GroupValidationSetDescription#getSemanticValidationRules
      * <em>Semantic Validation Rules</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference list '
      *         <em>Semantic Validation Rules</em>'.
      * @see org.eclipse.sirius.properties.GroupValidationSetDescription#getSemanticValidationRules()
@@ -1828,7 +1933,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.GroupValidationSetDescription#getPropertyValidationRules
      * <em>Property Validation Rules</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference list '
      *         <em>Property Validation Rules</em>'.
      * @see org.eclipse.sirius.properties.GroupValidationSetDescription#getPropertyValidationRules()
@@ -1842,7 +1947,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.ContainerDescription
      * <em>Container Description</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Container Description</em>'.
      * @see org.eclipse.sirius.properties.ContainerDescription
      * @generated
@@ -1853,7 +1958,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.properties.ContainerDescription#getIdentifier
      * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.ContainerDescription#getIdentifier()
      * @see #getContainerDescription()
@@ -1865,7 +1970,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the containment reference list '
      * {@link org.eclipse.sirius.properties.ContainerDescription#getWidgets
      * <em>Widgets</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference list '
      *         <em>Widgets</em>'.
      * @see org.eclipse.sirius.properties.ContainerDescription#getWidgets()
@@ -1904,7 +2009,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.properties.WidgetDescription#getIdentifier
      * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.WidgetDescription#getIdentifier()
      * @see #getWidgetDescription()
@@ -1929,7 +2034,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.properties.WidgetDescription#getHelpExpression
      * <em>Help Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Help Expression</em>'.
      * @see org.eclipse.sirius.properties.WidgetDescription#getHelpExpression()
      * @see #getWidgetDescription()
@@ -1977,6 +2082,18 @@ public interface PropertiesPackage extends EPackage {
     EReference getTextDescription_InitialOperation();
 
     /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.TextDescription#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.TextDescription#getStyle()
+     * @see #getTextDescription()
+     * @generated
+     */
+    EReference getTextDescription_Style();
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.ButtonDescription
      * <em>Button Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -1993,7 +2110,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.ButtonDescription#getButtonLabelExpression
      * <em>Button Label Expression</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '
      *         <em>Button Label Expression</em>'.
      * @see org.eclipse.sirius.properties.ButtonDescription#getButtonLabelExpression()
@@ -2032,7 +2149,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.properties.LabelDescription#getBodyExpression
      * <em>Body Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Body Expression</em>'.
      * @see org.eclipse.sirius.properties.LabelDescription#getBodyExpression()
      * @see #getLabelDescription()
@@ -2045,7 +2162,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.CheckboxDescription
      * <em>Checkbox Description</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Checkbox Description</em>'.
      * @see org.eclipse.sirius.properties.CheckboxDescription
      * @generated
@@ -2123,7 +2240,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.SelectDescription#getCandidatesExpression
      * <em>Candidates Expression</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Candidates Expression</em>
      *         '.
      * @see org.eclipse.sirius.properties.SelectDescription#getCandidatesExpression()
@@ -2137,7 +2254,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression
      * <em>Candidate Display Expression</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '
      *         <em>Candidate Display Expression</em>'.
      * @see org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression()
@@ -2162,7 +2279,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.properties.DynamicMappingFor#getIterator
      * <em>Iterator</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Iterator</em>'.
      * @see org.eclipse.sirius.properties.DynamicMappingFor#getIterator()
      * @see #getDynamicMappingFor()
@@ -2175,7 +2292,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression
      * <em>Domain Class Expression</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '
      *         <em>Domain Class Expression</em>'.
      * @see org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression()
@@ -2188,7 +2305,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the containment reference list '
      * {@link org.eclipse.sirius.properties.DynamicMappingFor#getIfs
      * <em>Ifs</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference list '<em>Ifs</em>
      *         '.
      * @see org.eclipse.sirius.properties.DynamicMappingFor#getIfs()
@@ -2214,7 +2331,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.DynamicMappingIf#getPredicateExpression
      * <em>Predicate Expression</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Predicate Expression</em>
      *         '.
      * @see org.eclipse.sirius.properties.DynamicMappingIf#getPredicateExpression()
@@ -2227,7 +2344,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the containment reference '
      * {@link org.eclipse.sirius.properties.DynamicMappingIf#getWidget
      * <em>Widget</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference '<em>Widget</em>'.
      * @see org.eclipse.sirius.properties.DynamicMappingIf#getWidget()
      * @see #getDynamicMappingIf()
@@ -2240,7 +2357,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.TextAreaDescription
      * <em>Text Area Description</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Text Area Description</em>'.
      * @see org.eclipse.sirius.properties.TextAreaDescription
      * @generated
@@ -2251,7 +2368,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.properties.TextAreaDescription#getLineCount
      * <em>Line Count</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Line Count</em>'.
      * @see org.eclipse.sirius.properties.TextAreaDescription#getLineCount()
      * @see #getTextAreaDescription()
@@ -2303,7 +2420,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.RadioDescription#getCandidatesExpression
      * <em>Candidates Expression</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Candidates Expression</em>
      *         '.
      * @see org.eclipse.sirius.properties.RadioDescription#getCandidatesExpression()
@@ -2317,7 +2434,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.RadioDescription#getCandidateDisplayExpression
      * <em>Candidate Display Expression</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '
      *         <em>Candidate Display Expression</em>'.
      * @see org.eclipse.sirius.properties.RadioDescription#getCandidateDisplayExpression()
@@ -2331,7 +2448,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.SingleReferenceDescription
      * <em>Single Reference Description</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Single Reference Description</em>
      *         '.
      * @see org.eclipse.sirius.properties.SingleReferenceDescription
@@ -2397,7 +2514,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the containment reference '
      * {@link org.eclipse.sirius.properties.SingleReferenceDescription#getUnsetOperation
      * <em>Unset Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference '
      *         <em>Unset Operation</em>'.
      * @see org.eclipse.sirius.properties.SingleReferenceDescription#getUnsetOperation()
@@ -2425,7 +2542,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.OperationDescription
      * <em>Operation Description</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '<em>Operation Description</em>'.
      * @see org.eclipse.sirius.properties.OperationDescription
      * @generated
@@ -2488,7 +2605,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.properties.CustomExpression#getIdentifier
      * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.CustomExpression#getIdentifier()
      * @see #getCustomExpression()
@@ -2525,7 +2642,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.properties.CustomOperation#getIdentifier
      * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.CustomOperation#getIdentifier()
      * @see #getCustomOperation()
@@ -2548,6 +2665,92 @@ public interface PropertiesPackage extends EPackage {
     EReference getCustomOperation_InitialOperation();
 
     /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.WidgetStyle <em>Widget Style</em>}'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for class '<em>Widget Style</em>'.
+     * @see org.eclipse.sirius.properties.WidgetStyle
+     * @generated
+     */
+    EClass getWidgetStyle();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.TextStyle <em>Text Style</em>}'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for class '<em>Text Style</em>'.
+     * @see org.eclipse.sirius.properties.TextStyle
+     * @generated
+     */
+    EClass getTextStyle();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.TextStyle#getFontNameExpression
+     * <em>Font Name Expression</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @return the meta object for the attribute '<em>Font Name Expression</em>
+     *         '.
+     * @see org.eclipse.sirius.properties.TextStyle#getFontNameExpression()
+     * @see #getTextStyle()
+     * @generated
+     */
+    EAttribute getTextStyle_FontNameExpression();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.TextStyle#getFontSize
+     * <em>Font Size</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for the attribute '<em>Font Size</em>'.
+     * @see org.eclipse.sirius.properties.TextStyle#getFontSize()
+     * @see #getTextStyle()
+     * @generated
+     */
+    EAttribute getTextStyle_FontSize();
+
+    /**
+     * Returns the meta object for the reference '
+     * {@link org.eclipse.sirius.properties.TextStyle#getBackgroundColor
+     * <em>Background Color</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the reference '<em>Background Color</em>'.
+     * @see org.eclipse.sirius.properties.TextStyle#getBackgroundColor()
+     * @see #getTextStyle()
+     * @generated
+     */
+    EReference getTextStyle_BackgroundColor();
+
+    /**
+     * Returns the meta object for the reference '
+     * {@link org.eclipse.sirius.properties.TextStyle#getForegroundColor
+     * <em>Foreground Color</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the reference '<em>Foreground Color</em>'.
+     * @see org.eclipse.sirius.properties.TextStyle#getForegroundColor()
+     * @see #getTextStyle()
+     * @generated
+     */
+    EReference getTextStyle_ForegroundColor();
+
+    /**
+     * Returns the meta object for the attribute list '
+     * {@link org.eclipse.sirius.properties.TextStyle#getFontFormat
+     * <em>Font Format</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return the meta object for the attribute list '<em>Font Format</em>'.
+     * @see org.eclipse.sirius.properties.TextStyle#getFontFormat()
+     * @see #getTextStyle()
+     * @generated
+     */
+    EAttribute getTextStyle_FontFormat();
+
+    /**
      * @generated
      */
     EReference getOperationDescription_InitialOperation();
@@ -2557,7 +2760,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.MultipleReferencesDescription
      * <em>Multiple References Description</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the meta object for class '
      *         <em>Multiple References Description</em>'.
      * @see org.eclipse.sirius.properties.MultipleReferencesDescription
@@ -2623,7 +2826,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the containment reference '
      * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getUnsetOperation
      * <em>Unset Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference '
      *         <em>Unset Operation</em>'.
      * @see org.eclipse.sirius.properties.MultipleReferencesDescription#getUnsetOperation()
@@ -2650,7 +2853,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the containment reference '
      * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getUpOperation
      * <em>Up Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference '
      *         <em>Up Operation</em>'.
      * @see org.eclipse.sirius.properties.MultipleReferencesDescription#getUpOperation()
@@ -2663,7 +2866,7 @@ public interface PropertiesPackage extends EPackage {
      * Returns the meta object for the containment reference '
      * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getDownOperation
      * <em>Down Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the containment reference '
      *         <em>Down Operation</em>'.
      * @see org.eclipse.sirius.properties.MultipleReferencesDescription#getDownOperation()
@@ -2691,7 +2894,7 @@ public interface PropertiesPackage extends EPackage {
      * <li>and each data type</li>
      * </ul>
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     interface Literals {
@@ -2700,7 +2903,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl
          * <em>View Extension Description</em>}' class. <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getViewExtensionDescription()
          * @generated
@@ -2710,7 +2913,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute VIEW_EXTENSION_DESCRIPTION__IDENTIFIER = PropertiesPackage.eINSTANCE.getViewExtensionDescription_Identifier();
@@ -2718,7 +2921,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Metamodels</b></em>'
          * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference VIEW_EXTENSION_DESCRIPTION__METAMODELS = PropertiesPackage.eINSTANCE.getViewExtensionDescription_Metamodels();
@@ -2726,7 +2929,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Pages</b></em>' containment
          * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference VIEW_EXTENSION_DESCRIPTION__PAGES = PropertiesPackage.eINSTANCE.getViewExtensionDescription_Pages();
@@ -2734,7 +2937,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Groups</b></em>' containment
          * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference VIEW_EXTENSION_DESCRIPTION__GROUPS = PropertiesPackage.eINSTANCE.getViewExtensionDescription_Groups();
@@ -2744,7 +2947,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.PageDescriptionImpl
          * <em>Page Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.PageDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getPageDescription()
          * @generated
@@ -2754,7 +2957,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute PAGE_DESCRIPTION__IDENTIFIER = PropertiesPackage.eINSTANCE.getPageDescription_Identifier();
@@ -2762,7 +2965,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Label Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute PAGE_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.eINSTANCE.getPageDescription_LabelExpression();
@@ -2770,7 +2973,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Domain Class</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute PAGE_DESCRIPTION__DOMAIN_CLASS = PropertiesPackage.eINSTANCE.getPageDescription_DomainClass();
@@ -2779,7 +2982,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '
          * <em><b>Semantic Candidate Expression</b></em>' attribute feature.
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION = PropertiesPackage.eINSTANCE.getPageDescription_SemanticCandidateExpression();
@@ -2787,7 +2990,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Groups</b></em>' reference
          * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference PAGE_DESCRIPTION__GROUPS = PropertiesPackage.eINSTANCE.getPageDescription_Groups();
@@ -2796,7 +2999,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Validation Set</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference PAGE_DESCRIPTION__VALIDATION_SET = PropertiesPackage.eINSTANCE.getPageDescription_ValidationSet();
@@ -2806,7 +3009,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.PageValidationSetDescriptionImpl
          * <em>Page Validation Set Description</em>}' class. <!-- begin-user-doc
          * --> <!-- end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.PageValidationSetDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getPageValidationSetDescription()
          * @generated
@@ -2817,7 +3020,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '
          * <em><b>Semantic Validation Rules</b></em>' containment reference list
          * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference PAGE_VALIDATION_SET_DESCRIPTION__SEMANTIC_VALIDATION_RULES = PropertiesPackage.eINSTANCE.getPageValidationSetDescription_SemanticValidationRules();
@@ -2827,7 +3030,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.PropertyValidationRuleImpl
          * <em>Property Validation Rule</em>}' class. <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.PropertyValidationRuleImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getPropertyValidationRule()
          * @generated
@@ -2837,7 +3040,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Targets</b></em>' reference
          * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference PROPERTY_VALIDATION_RULE__TARGETS = PropertiesPackage.eINSTANCE.getPropertyValidationRule_Targets();
@@ -2847,7 +3050,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl
          * <em>Group Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.GroupDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getGroupDescription()
          * @generated
@@ -2857,7 +3060,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute GROUP_DESCRIPTION__IDENTIFIER = PropertiesPackage.eINSTANCE.getGroupDescription_Identifier();
@@ -2865,7 +3068,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Label Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute GROUP_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.eINSTANCE.getGroupDescription_LabelExpression();
@@ -2873,7 +3076,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Domain Class</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute GROUP_DESCRIPTION__DOMAIN_CLASS = PropertiesPackage.eINSTANCE.getGroupDescription_DomainClass();
@@ -2882,7 +3085,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '
          * <em><b>Semantic Candidate Expression</b></em>' attribute feature.
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION = PropertiesPackage.eINSTANCE.getGroupDescription_SemanticCandidateExpression();
@@ -2891,7 +3094,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Container</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference GROUP_DESCRIPTION__CONTAINER = PropertiesPackage.eINSTANCE.getGroupDescription_Container();
@@ -2900,7 +3103,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Validation Set</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference GROUP_DESCRIPTION__VALIDATION_SET = PropertiesPackage.eINSTANCE.getGroupDescription_ValidationSet();
@@ -2921,7 +3124,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '
          * <em><b>Semantic Validation Rules</b></em>' containment reference list
          * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference GROUP_VALIDATION_SET_DESCRIPTION__SEMANTIC_VALIDATION_RULES = PropertiesPackage.eINSTANCE.getGroupValidationSetDescription_SemanticValidationRules();
@@ -2930,7 +3133,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '
          * <em><b>Property Validation Rules</b></em>' containment reference list
          * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference GROUP_VALIDATION_SET_DESCRIPTION__PROPERTY_VALIDATION_RULES = PropertiesPackage.eINSTANCE.getGroupValidationSetDescription_PropertyValidationRules();
@@ -2940,7 +3143,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl
          * <em>Container Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.ContainerDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getContainerDescription()
          * @generated
@@ -2950,7 +3153,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute CONTAINER_DESCRIPTION__IDENTIFIER = PropertiesPackage.eINSTANCE.getContainerDescription_Identifier();
@@ -2958,7 +3161,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Widgets</b></em>' containment
          * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference CONTAINER_DESCRIPTION__WIDGETS = PropertiesPackage.eINSTANCE.getContainerDescription_Widgets();
@@ -2967,7 +3170,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Dynamic Mappings</b></em>'
          * containment reference list feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS = PropertiesPackage.eINSTANCE.getContainerDescription_DynamicMappings();
@@ -2977,7 +3180,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl
          * <em>Widget Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.WidgetDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getWidgetDescription()
          * @generated
@@ -2987,7 +3190,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute WIDGET_DESCRIPTION__IDENTIFIER = PropertiesPackage.eINSTANCE.getWidgetDescription_Identifier();
@@ -2995,7 +3198,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Label Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute WIDGET_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.eINSTANCE.getWidgetDescription_LabelExpression();
@@ -3003,7 +3206,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Help Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute WIDGET_DESCRIPTION__HELP_EXPRESSION = PropertiesPackage.eINSTANCE.getWidgetDescription_HelpExpression();
@@ -3013,7 +3216,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.TextDescriptionImpl
          * <em>Text Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.TextDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextDescription()
          * @generated
@@ -3023,7 +3226,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Value Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute TEXT_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.eINSTANCE.getTextDescription_ValueExpression();
@@ -3032,17 +3235,25 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Initial Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference TEXT_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getTextDescription_InitialOperation();
 
         /**
+         * The meta object literal for the '<em><b>Style</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference TEXT_DESCRIPTION__STYLE = PropertiesPackage.eINSTANCE.getTextDescription_Style();
+
+        /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.ButtonDescriptionImpl
          * <em>Button Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.ButtonDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getButtonDescription()
          * @generated
@@ -3062,7 +3273,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Initial Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference BUTTON_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getButtonDescription_InitialOperation();
@@ -3072,7 +3283,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.LabelDescriptionImpl
          * <em>Label Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.LabelDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getLabelDescription()
          * @generated
@@ -3082,7 +3293,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Body Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute LABEL_DESCRIPTION__BODY_EXPRESSION = PropertiesPackage.eINSTANCE.getLabelDescription_BodyExpression();
@@ -3092,7 +3303,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl
          * <em>Checkbox Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCheckboxDescription()
          * @generated
@@ -3102,7 +3313,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Value Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute CHECKBOX_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.eINSTANCE.getCheckboxDescription_ValueExpression();
@@ -3111,7 +3322,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Initial Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference CHECKBOX_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getCheckboxDescription_InitialOperation();
@@ -3121,7 +3332,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl
          * <em>Select Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.SelectDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSelectDescription()
          * @generated
@@ -3131,7 +3342,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Value Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute SELECT_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.eINSTANCE.getSelectDescription_ValueExpression();
@@ -3140,7 +3351,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Initial Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference SELECT_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getSelectDescription_InitialOperation();
@@ -3168,7 +3379,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl
          * <em>Dynamic Mapping For</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.DynamicMappingForImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getDynamicMappingFor()
          * @generated
@@ -3178,7 +3389,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Iterator</b></em>' attribute
          * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute DYNAMIC_MAPPING_FOR__ITERATOR = PropertiesPackage.eINSTANCE.getDynamicMappingFor_Iterator();
@@ -3195,7 +3406,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Ifs</b></em>' containment
          * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference DYNAMIC_MAPPING_FOR__IFS = PropertiesPackage.eINSTANCE.getDynamicMappingFor_Ifs();
@@ -3205,7 +3416,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.DynamicMappingIfImpl
          * <em>Dynamic Mapping If</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.DynamicMappingIfImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getDynamicMappingIf()
          * @generated
@@ -3215,7 +3426,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Predicate Expression</b></em>
          * ' attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute DYNAMIC_MAPPING_IF__PREDICATE_EXPRESSION = PropertiesPackage.eINSTANCE.getDynamicMappingIf_PredicateExpression();
@@ -3223,7 +3434,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Widget</b></em>' containment
          * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference DYNAMIC_MAPPING_IF__WIDGET = PropertiesPackage.eINSTANCE.getDynamicMappingIf_Widget();
@@ -3233,7 +3444,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.TextAreaDescriptionImpl
          * <em>Text Area Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.TextAreaDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextAreaDescription()
          * @generated
@@ -3243,7 +3454,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Line Count</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute TEXT_AREA_DESCRIPTION__LINE_COUNT = PropertiesPackage.eINSTANCE.getTextAreaDescription_LineCount();
@@ -3253,7 +3464,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.RadioDescriptionImpl
          * <em>Radio Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.RadioDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getRadioDescription()
          * @generated
@@ -3263,7 +3474,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Value Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute RADIO_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.eINSTANCE.getRadioDescription_ValueExpression();
@@ -3272,7 +3483,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Initial Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference RADIO_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getRadioDescription_InitialOperation();
@@ -3300,7 +3511,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.SingleReferenceDescriptionImpl
          * <em>Single Reference Description</em>}' class. <!-- begin-user-doc
          * --> <!-- end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.SingleReferenceDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSingleReferenceDescription()
          * @generated
@@ -3310,7 +3521,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Value Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute SINGLE_REFERENCE_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.eINSTANCE.getSingleReferenceDescription_ValueExpression();
@@ -3318,7 +3529,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Display Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute SINGLE_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION = PropertiesPackage.eINSTANCE.getSingleReferenceDescription_DisplayExpression();
@@ -3328,7 +3539,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.CustomDescriptionImpl
          * <em>Custom Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.CustomDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomDescription()
          * @generated
@@ -3339,7 +3550,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Custom Expressions</b></em>'
          * containment reference list feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference CUSTOM_DESCRIPTION__CUSTOM_EXPRESSIONS = PropertiesPackage.eINSTANCE.getCustomDescription_CustomExpressions();
@@ -3348,7 +3559,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Custom Operations</b></em>'
          * containment reference list feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference CUSTOM_DESCRIPTION__CUSTOM_OPERATIONS = PropertiesPackage.eINSTANCE.getCustomDescription_CustomOperations();
@@ -3358,7 +3569,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.CustomExpressionImpl
          * <em>Custom Expression</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.CustomExpressionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomExpression()
          * @generated
@@ -3368,7 +3579,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute CUSTOM_EXPRESSION__IDENTIFIER = PropertiesPackage.eINSTANCE.getCustomExpression_Identifier();
@@ -3376,7 +3587,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Custom Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute CUSTOM_EXPRESSION__CUSTOM_EXPRESSION = PropertiesPackage.eINSTANCE.getCustomExpression_CustomExpression();
@@ -3386,7 +3597,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.CustomOperationImpl
          * <em>Custom Operation</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.CustomOperationImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomOperation()
          * @generated
@@ -3396,7 +3607,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute CUSTOM_OPERATION__IDENTIFIER = PropertiesPackage.eINSTANCE.getCustomOperation_Identifier();
@@ -3405,12 +3616,76 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Initial Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference CUSTOM_OPERATION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getCustomOperation_InitialOperation();
 
         /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.WidgetStyleImpl
+         * <em>Widget Style</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @see org.eclipse.sirius.properties.impl.WidgetStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getWidgetStyle()
+         * @generated
+         */
+        EClass WIDGET_STYLE = PropertiesPackage.eINSTANCE.getWidgetStyle();
+
+        /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.TextStyleImpl
+         * <em>Text Style</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @see org.eclipse.sirius.properties.impl.TextStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextStyle()
+         * @generated
+         */
+        EClass TEXT_STYLE = PropertiesPackage.eINSTANCE.getTextStyle();
+
+        /**
+         * The meta object literal for the '<em><b>Font Name Expression</b></em>
+         * ' attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EAttribute TEXT_STYLE__FONT_NAME_EXPRESSION = PropertiesPackage.eINSTANCE.getTextStyle_FontNameExpression();
+
+        /**
+         * The meta object literal for the '<em><b>Font Size</b></em>' attribute
+         * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EAttribute TEXT_STYLE__FONT_SIZE = PropertiesPackage.eINSTANCE.getTextStyle_FontSize();
+
+        /**
+         * The meta object literal for the '<em><b>Background Color</b></em>'
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference TEXT_STYLE__BACKGROUND_COLOR = PropertiesPackage.eINSTANCE.getTextStyle_BackgroundColor();
+
+        /**
+         * The meta object literal for the '<em><b>Foreground Color</b></em>'
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference TEXT_STYLE__FOREGROUND_COLOR = PropertiesPackage.eINSTANCE.getTextStyle_ForegroundColor();
+
+        /**
+         * The meta object literal for the '<em><b>Font Format</b></em>'
+         * attribute list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EAttribute TEXT_STYLE__FONT_FORMAT = PropertiesPackage.eINSTANCE.getTextStyle_FontFormat();
+
+        /**
          * The meta object literal for the ' end-user-doc -->
          *
          * @generated
@@ -3421,7 +3696,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Search Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference SINGLE_REFERENCE_DESCRIPTION__SEARCH_OPERATION = PropertiesPackage.eINSTANCE.getSingleReferenceDescription_SearchOperation();
@@ -3430,7 +3705,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Unset Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference SINGLE_REFERENCE_DESCRIPTION__UNSET_OPERATION = PropertiesPackage.eINSTANCE.getSingleReferenceDescription_UnsetOperation();
@@ -3439,7 +3714,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>On Click Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference SINGLE_REFERENCE_DESCRIPTION__ON_CLICK_OPERATION = PropertiesPackage.eINSTANCE.getSingleReferenceDescription_OnClickOperation();
@@ -3449,7 +3724,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.OperationDescriptionImpl
          * <em>Operation Description</em>}' class. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.OperationDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getOperationDescription()
          * @generated
@@ -3460,7 +3735,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Initial Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference OPERATION_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getOperationDescription_InitialOperation();
@@ -3470,7 +3745,7 @@ public interface PropertiesPackage extends EPackage {
          * {@link org.eclipse.sirius.properties.impl.MultipleReferencesDescriptionImpl
          * <em>Multiple References Description</em>}' class. <!-- begin-user-doc
          * --> <!-- end-user-doc -->
-         * 
+         *
          * @see org.eclipse.sirius.properties.impl.MultipleReferencesDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getMultipleReferencesDescription()
          * @generated
@@ -3480,7 +3755,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Value Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute MULTIPLE_REFERENCES_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_ValueExpression();
@@ -3488,7 +3763,7 @@ public interface PropertiesPackage extends EPackage {
         /**
          * The meta object literal for the '<em><b>Display Expression</b></em>'
          * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
         EAttribute MULTIPLE_REFERENCES_DESCRIPTION__DISPLAY_EXPRESSION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_DisplayExpression();
@@ -3497,7 +3772,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Create Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference MULTIPLE_REFERENCES_DESCRIPTION__CREATE_OPERATION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_CreateOperation();
@@ -3506,7 +3781,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Search Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference MULTIPLE_REFERENCES_DESCRIPTION__SEARCH_OPERATION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_SearchOperation();
@@ -3515,7 +3790,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Unset Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference MULTIPLE_REFERENCES_DESCRIPTION__UNSET_OPERATION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_UnsetOperation();
@@ -3524,7 +3799,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>On Click Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference MULTIPLE_REFERENCES_DESCRIPTION__ON_CLICK_OPERATION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_OnClickOperation();
@@ -3533,7 +3808,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Up Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference MULTIPLE_REFERENCES_DESCRIPTION__UP_OPERATION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_UpOperation();
@@ -3542,7 +3817,7 @@ public interface PropertiesPackage extends EPackage {
          * The meta object literal for the '<em><b>Down Operation</b></em>'
          * containment reference feature. <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         * 
+         *
          * @generated
          */
         EReference MULTIPLE_REFERENCES_DESCRIPTION__DOWN_OPERATION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_DownOperation();
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioDescription.java
index 9b15ae466c..5aed3a0d44 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioDescription.java
@@ -61,7 +61,7 @@ public interface RadioDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.RadioDescription#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()
@@ -89,7 +89,7 @@ public interface RadioDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.RadioDescription#getInitialOperation
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Initial Operation</em>' containment
      *            reference.
@@ -118,7 +118,7 @@ public interface RadioDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.RadioDescription#getCandidatesExpression
      * <em>Candidates Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Candidates Expression</em>'
      *            attribute.
@@ -148,7 +148,7 @@ public interface RadioDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.RadioDescription#getCandidateDisplayExpression
      * <em>Candidate Display Expression</em>}' attribute. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Candidate Display Expression</em>'
      *            attribute.
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java
index 5d773c8fc6..a5167d3132 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java
@@ -62,7 +62,7 @@ public interface SelectDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.SelectDescription#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()
@@ -90,7 +90,7 @@ public interface SelectDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.SelectDescription#getInitialOperation
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Initial Operation</em>' containment
      *            reference.
@@ -119,7 +119,7 @@ public interface SelectDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.SelectDescription#getCandidatesExpression
      * <em>Candidates Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Candidates Expression</em>'
      *            attribute.
@@ -149,7 +149,7 @@ public interface SelectDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression
      * <em>Candidate Display Expression</em>}' attribute. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Candidate Display Expression</em>'
      *            attribute.
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SingleReferenceDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SingleReferenceDescription.java
index 1c2a9dc6f9..ca9e451bbb 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SingleReferenceDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SingleReferenceDescription.java
@@ -66,7 +66,7 @@ public interface SingleReferenceDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.SingleReferenceDescription#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()
@@ -93,7 +93,7 @@ public interface SingleReferenceDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.SingleReferenceDescription#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()
@@ -121,7 +121,7 @@ public interface SingleReferenceDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.SingleReferenceDescription#getCreateOperation
      * <em>Create Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Create Operation</em>' containment
      *            reference.
@@ -150,7 +150,7 @@ public interface SingleReferenceDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.SingleReferenceDescription#getSearchOperation
      * <em>Search Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Search Operation</em>' containment
      *            reference.
@@ -179,7 +179,7 @@ public interface SingleReferenceDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.SingleReferenceDescription#getUnsetOperation
      * <em>Unset Operation</em>}' containment reference. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Unset Operation</em>' containment
      *            reference.
@@ -208,7 +208,7 @@ public interface SingleReferenceDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.SingleReferenceDescription#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.
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextAreaDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextAreaDescription.java
index 23e5be3a16..ef27deb1a7 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextAreaDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextAreaDescription.java
@@ -39,7 +39,7 @@ public interface TextAreaDescription extends TextDescription {
      * really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Line Count</em>' attribute.
      * @see #setLineCount(int)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getTextAreaDescription_LineCount()
@@ -53,7 +53,7 @@ public interface TextAreaDescription extends TextDescription {
      * {@link org.eclipse.sirius.properties.TextAreaDescription#getLineCount
      * <em>Line Count</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Line Count</em>' attribute.
      * @see #getLineCount()
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java
index a642d2d2f9..eb217a2802 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java
@@ -24,6 +24,8 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em>Value Expression</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.TextDescription#getInitialOperation
  * <em>Initial Operation</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.TextDescription#getStyle <em>Style
+ * </em>}</li>
  * </ul>
  * </p>
  *
@@ -40,7 +42,7 @@ public interface TextDescription extends WidgetDescription {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Value Expression</em>' attribute.
      * @see #setValueExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getTextDescription_ValueExpression()
@@ -55,7 +57,7 @@ public interface TextDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.TextDescription#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()
@@ -71,7 +73,7 @@ public interface TextDescription extends WidgetDescription {
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Initial Operation</em>' containment
      *         reference.
      * @see #setInitialOperation(InitialOperation)
@@ -86,7 +88,7 @@ public interface TextDescription extends WidgetDescription {
      * {@link org.eclipse.sirius.properties.TextDescription#getInitialOperation
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Initial Operation</em>' containment
      *            reference.
@@ -95,4 +97,34 @@ public interface TextDescription extends WidgetDescription {
      */
     void setInitialOperation(InitialOperation value);
 
+    /**
+     * 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(TextStyle)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextDescription_Style()
+     * @model containment="true"
+     * @generated
+     */
+    TextStyle getStyle();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.TextDescription#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(TextStyle value);
+
 } // TextDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextStyle.java
new file mode 100644
index 0000000000..19ed1ab5af
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextStyle.java
@@ -0,0 +1,185 @@
+/**
+ * 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.FontFormat;
+import org.eclipse.sirius.viewpoint.description.ColorDescription;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Text Style</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.sirius.properties.TextStyle#getFontNameExpression <em>
+ * Font Name Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.TextStyle#getFontSize <em>Font Size
+ * </em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.TextStyle#getBackgroundColor <em>
+ * Background Color</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.TextStyle#getForegroundColor <em>
+ * Foreground Color</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.TextStyle#getFontFormat <em>Font
+ * Format</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getTextStyle()
+ * @model
+ * @generated
+ */
+public interface TextStyle extends WidgetStyle {
+    /**
+     * Returns the value of the '<em><b>Font Name Expression</b></em>'
+     * attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Font Name Expression</em>' attribute isn't
+     * clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Font Name Expression</em>' attribute.
+     * @see #setFontNameExpression(String)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextStyle_FontNameExpression()
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @generated
+     */
+    String getFontNameExpression();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.TextStyle#getFontNameExpression
+     * <em>Font Name Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Font Name Expression</em>'
+     *            attribute.
+     * @see #getFontNameExpression()
+     * @generated
+     */
+    void setFontNameExpression(String value);
+
+    /**
+     * Returns the value of the '<em><b>Font Size</b></em>' attribute. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Font Size</em>' attribute isn't clear, there
+     * really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Font Size</em>' attribute.
+     * @see #setFontSize(int)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextStyle_FontSize()
+     * @model
+     * @generated
+     */
+    int getFontSize();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.TextStyle#getFontSize
+     * <em>Font Size</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @param value
+     *            the new value of the '<em>Font Size</em>' attribute.
+     * @see #getFontSize()
+     * @generated
+     */
+    void setFontSize(int value);
+
+    /**
+     * Returns the value of the '<em><b>Background Color</b></em>' reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Background Color</em>' reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Background Color</em>' reference.
+     * @see #setBackgroundColor(ColorDescription)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextStyle_BackgroundColor()
+     * @model
+     * @generated
+     */
+    ColorDescription getBackgroundColor();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.TextStyle#getBackgroundColor
+     * <em>Background Color</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Background Color</em>' reference.
+     * @see #getBackgroundColor()
+     * @generated
+     */
+    void setBackgroundColor(ColorDescription value);
+
+    /**
+     * Returns the value of the '<em><b>Foreground Color</b></em>' reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Foreground Color</em>' reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Foreground Color</em>' reference.
+     * @see #setForegroundColor(ColorDescription)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextStyle_ForegroundColor()
+     * @model
+     * @generated
+     */
+    ColorDescription getForegroundColor();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.TextStyle#getForegroundColor
+     * <em>Foreground Color</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Foreground Color</em>' reference.
+     * @see #getForegroundColor()
+     * @generated
+     */
+    void setForegroundColor(ColorDescription value);
+
+    /**
+     * Returns the value of the '<em><b>Font Format</b></em>' attribute list.
+     * The list contents are of type
+     * {@link org.eclipse.sirius.viewpoint.FontFormat}. The literals are from
+     * the enumeration {@link org.eclipse.sirius.viewpoint.FontFormat}. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Font Format</em>' attribute isn't clear, there
+     * really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Font Format</em>' attribute list.
+     * @see org.eclipse.sirius.viewpoint.FontFormat
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextStyle_FontFormat()
+     * @model upper="4"
+     * @generated
+     */
+    EList<FontFormat> getFontFormat();
+
+} // TextStyle
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java
index f6a3cad5a2..0544131327 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java
@@ -62,7 +62,7 @@ public interface ViewExtensionDescription extends Extension {
      * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getIdentifier
      * <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java
index 4bd6d61b02..a91682a466 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java
@@ -57,7 +57,7 @@ public interface WidgetDescription extends EObject {
      * {@link org.eclipse.sirius.properties.WidgetDescription#getIdentifier
      * <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
@@ -73,7 +73,7 @@ public interface WidgetDescription extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Label Expression</em>' attribute.
      * @see #setLabelExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetDescription_LabelExpression()
@@ -88,7 +88,7 @@ public interface WidgetDescription extends EObject {
      * {@link org.eclipse.sirius.properties.WidgetDescription#getLabelExpression
      * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Label Expression</em>' attribute.
      * @see #getLabelExpression()
@@ -104,7 +104,7 @@ public interface WidgetDescription extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Help Expression</em>' attribute.
      * @see #setHelpExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetDescription_HelpExpression()
@@ -119,7 +119,7 @@ public interface WidgetDescription extends EObject {
      * {@link org.eclipse.sirius.properties.WidgetDescription#getHelpExpression
      * <em>Help Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Help Expression</em>' attribute.
      * @see #getHelpExpression()
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetStyle.java
new file mode 100644
index 0000000000..c52603f783
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetStyle.java
@@ -0,0 +1,26 @@
+/**
+ * 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.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Widget Style</b></em>'. <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetStyle()
+ * @model
+ * @generated
+ */
+public interface WidgetStyle extends EObject {
+} // WidgetStyle
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonDescriptionImpl.java
index a5811fd565..4b1dd56b5c 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonDescriptionImpl.java
@@ -42,7 +42,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
      * The default value of the '{@link #getButtonLabelExpression()
      * <em>Button Label Expression</em>}' attribute. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see #getButtonLabelExpression()
      * @generated
      * @ordered
@@ -53,7 +53,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
      * The cached value of the '{@link #getButtonLabelExpression()
      * <em>Button Label Expression</em>}' attribute. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see #getButtonLabelExpression()
      * @generated
      * @ordered
@@ -64,7 +64,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
      * The cached value of the '{@link #getInitialOperation()
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getInitialOperation()
      * @generated
      * @ordered
@@ -73,7 +73,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ButtonDescriptionImpl() {
@@ -82,7 +82,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -92,7 +92,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -102,7 +102,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -116,7 +116,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -126,7 +126,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetInitialOperation(InitialOperation newInitialOperation, NotificationChain msgs) {
@@ -145,7 +145,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -169,7 +169,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -183,7 +183,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -199,7 +199,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -217,7 +217,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -235,7 +235,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -243,7 +243,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
         switch (featureID) {
         case PropertiesPackage.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION:
             return ButtonDescriptionImpl.BUTTON_LABEL_EXPRESSION_EDEFAULT == null ? buttonLabelExpression != null : !ButtonDescriptionImpl.BUTTON_LABEL_EXPRESSION_EDEFAULT
-                    .equals(buttonLabelExpression);
+            .equals(buttonLabelExpression);
         case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
             return initialOperation != null;
         }
@@ -252,7 +252,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java
index 4dab1603af..8c2080efec 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java
@@ -42,7 +42,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
      * The default value of the '{@link #getValueExpression()
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -53,7 +53,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
      * The cached value of the '{@link #getValueExpression()
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -64,7 +64,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
      * The cached value of the '{@link #getInitialOperation()
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getInitialOperation()
      * @generated
      * @ordered
@@ -73,7 +73,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected CheckboxDescriptionImpl() {
@@ -82,7 +82,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -92,7 +92,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -102,7 +102,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -116,7 +116,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -126,7 +126,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetInitialOperation(InitialOperation newInitialOperation, NotificationChain msgs) {
@@ -145,7 +145,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -169,7 +169,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -183,7 +183,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -199,7 +199,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -217,7 +217,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -235,7 +235,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -251,7 +251,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java
index 5d4e925dee..ee831b6665 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java
@@ -51,7 +51,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     /**
      * The default value of the '{@link #getIdentifier() <em>Identifier</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -61,7 +61,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     /**
      * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -71,7 +71,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     /**
      * The cached value of the '{@link #getWidgets() <em>Widgets</em>}'
      * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getWidgets()
      * @generated
      * @ordered
@@ -91,7 +91,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ContainerDescriptionImpl() {
@@ -100,7 +100,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -110,7 +110,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -120,7 +120,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -134,7 +134,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -147,7 +147,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -160,7 +160,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -176,7 +176,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -194,7 +194,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @SuppressWarnings("unchecked")
@@ -218,7 +218,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -239,7 +239,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -257,7 +257,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomDescriptionImpl.java
index 72cb976975..fcf4f9cd25 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomDescriptionImpl.java
@@ -66,7 +66,7 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected CustomDescriptionImpl() {
@@ -75,7 +75,7 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -85,7 +85,7 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -98,7 +98,7 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -111,7 +111,7 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -127,7 +127,7 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -143,7 +143,7 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @SuppressWarnings("unchecked")
@@ -164,7 +164,7 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -182,7 +182,7 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomExpressionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomExpressionImpl.java
index 3b1b7a4815..10c241ba10 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomExpressionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomExpressionImpl.java
@@ -39,7 +39,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
     /**
      * The default value of the '{@link #getIdentifier() <em>Identifier</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -49,7 +49,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
     /**
      * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -60,7 +60,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
      * The default value of the '{@link #getCustomExpression()
      * <em>Custom Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getCustomExpression()
      * @generated
      * @ordered
@@ -71,7 +71,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
      * The cached value of the '{@link #getCustomExpression()
      * <em>Custom Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getCustomExpression()
      * @generated
      * @ordered
@@ -80,7 +80,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected CustomExpressionImpl() {
@@ -89,7 +89,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -99,7 +99,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -109,7 +109,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -123,7 +123,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -133,7 +133,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -147,7 +147,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -163,7 +163,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -181,7 +181,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -199,7 +199,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -215,7 +215,7 @@ public class CustomExpressionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomOperationImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomOperationImpl.java
index db632a5bf1..971ce3edb7 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomOperationImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomOperationImpl.java
@@ -42,7 +42,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
     /**
      * The default value of the '{@link #getIdentifier() <em>Identifier</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -52,7 +52,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
     /**
      * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -63,7 +63,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
      * The cached value of the '{@link #getInitialOperation()
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getInitialOperation()
      * @generated
      * @ordered
@@ -72,7 +72,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected CustomOperationImpl() {
@@ -81,7 +81,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -91,7 +91,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -101,7 +101,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -115,7 +115,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -125,7 +125,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetInitialOperation(InitialOperation newInitialOperation, NotificationChain msgs) {
@@ -144,7 +144,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -168,7 +168,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -182,7 +182,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -198,7 +198,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -216,7 +216,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -234,7 +234,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -250,7 +250,7 @@ public class CustomOperationImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java
index a8ef9d3072..719f950325 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java
@@ -49,7 +49,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     /**
      * The default value of the '{@link #getIterator() <em>Iterator</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIterator()
      * @generated
      * @ordered
@@ -59,7 +59,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     /**
      * The cached value of the '{@link #getIterator() <em>Iterator</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIterator()
      * @generated
      * @ordered
@@ -70,7 +70,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
      * The default value of the '{@link #getDomainClassExpression()
      * <em>Domain Class Expression</em>}' attribute. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see #getDomainClassExpression()
      * @generated
      * @ordered
@@ -81,7 +81,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
      * The cached value of the '{@link #getDomainClassExpression()
      * <em>Domain Class Expression</em>}' attribute. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see #getDomainClassExpression()
      * @generated
      * @ordered
@@ -91,7 +91,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     /**
      * The cached value of the '{@link #getIfs() <em>Ifs</em>}' containment
      * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIfs()
      * @generated
      * @ordered
@@ -100,7 +100,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected DynamicMappingForImpl() {
@@ -109,7 +109,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -119,7 +119,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -129,7 +129,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -143,7 +143,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -153,7 +153,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -167,7 +167,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -180,7 +180,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -194,7 +194,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -212,7 +212,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @SuppressWarnings("unchecked")
@@ -235,7 +235,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -256,7 +256,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -266,7 +266,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
             return DynamicMappingForImpl.ITERATOR_EDEFAULT == null ? iterator != null : !DynamicMappingForImpl.ITERATOR_EDEFAULT.equals(iterator);
         case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION:
             return DynamicMappingForImpl.DOMAIN_CLASS_EXPRESSION_EDEFAULT == null ? domainClassExpression != null : !DynamicMappingForImpl.DOMAIN_CLASS_EXPRESSION_EDEFAULT
-                    .equals(domainClassExpression);
+            .equals(domainClassExpression);
         case PropertiesPackage.DYNAMIC_MAPPING_FOR__IFS:
             return ifs != null && !ifs.isEmpty();
         }
@@ -275,7 +275,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingIfImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingIfImpl.java
index 7c3414ada4..ba39631023 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingIfImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingIfImpl.java
@@ -42,7 +42,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
      * The default value of the '{@link #getPredicateExpression()
      * <em>Predicate Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getPredicateExpression()
      * @generated
      * @ordered
@@ -53,7 +53,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
      * The cached value of the '{@link #getPredicateExpression()
      * <em>Predicate Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getPredicateExpression()
      * @generated
      * @ordered
@@ -63,7 +63,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
     /**
      * The cached value of the '{@link #getWidget() <em>Widget</em>}'
      * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getWidget()
      * @generated
      * @ordered
@@ -72,7 +72,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected DynamicMappingIfImpl() {
@@ -81,7 +81,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -91,7 +91,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -101,7 +101,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -115,7 +115,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -125,7 +125,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetWidget(WidgetDescription newWidget, NotificationChain msgs) {
@@ -144,7 +144,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -168,7 +168,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -182,7 +182,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -198,7 +198,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -216,7 +216,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -234,7 +234,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -250,7 +250,7 @@ public class DynamicMappingIfImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java
index 79f1ab9967..82bf4c905b 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java
@@ -55,7 +55,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     /**
      * The default value of the '{@link #getIdentifier() <em>Identifier</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -65,7 +65,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     /**
      * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -76,7 +76,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * The default value of the '{@link #getLabelExpression()
      * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -87,7 +87,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * The cached value of the '{@link #getLabelExpression()
      * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -97,7 +97,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     /**
      * The default value of the '{@link #getDomainClass() <em>Domain Class</em>}
      * ' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getDomainClass()
      * @generated
      * @ordered
@@ -107,7 +107,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     /**
      * The cached value of the '{@link #getDomainClass() <em>Domain Class</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getDomainClass()
      * @generated
      * @ordered
@@ -118,7 +118,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * The default value of the '{@link #getSemanticCandidateExpression()
      * <em>Semantic Candidate Expression</em>}' attribute. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getSemanticCandidateExpression()
      * @generated
      * @ordered
@@ -129,7 +129,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * The cached value of the '{@link #getSemanticCandidateExpression()
      * <em>Semantic Candidate Expression</em>}' attribute. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getSemanticCandidateExpression()
      * @generated
      * @ordered
@@ -139,7 +139,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     /**
      * The cached value of the '{@link #getContainer() <em>Container</em>}'
      * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getContainer()
      * @generated
      * @ordered
@@ -150,7 +150,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * The cached value of the '{@link #getValidationSet()
      * <em>Validation Set</em>}' containment reference. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see #getValidationSet()
      * @generated
      * @ordered
@@ -159,7 +159,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected GroupDescriptionImpl() {
@@ -168,7 +168,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -178,7 +178,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -188,7 +188,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -202,7 +202,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -212,7 +212,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -226,7 +226,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -236,7 +236,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -250,7 +250,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -260,7 +260,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -274,7 +274,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -284,7 +284,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetContainer(ContainerDescription newContainer, NotificationChain msgs) {
@@ -303,7 +303,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -327,7 +327,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -337,7 +337,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetValidationSet(GroupValidationSetDescription newValidationSet, NotificationChain msgs) {
@@ -356,7 +356,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -380,7 +380,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -396,7 +396,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -420,7 +420,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -450,7 +450,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -480,7 +480,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -494,7 +494,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
             return GroupDescriptionImpl.DOMAIN_CLASS_EDEFAULT == null ? domainClass != null : !GroupDescriptionImpl.DOMAIN_CLASS_EDEFAULT.equals(domainClass);
         case PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
             return GroupDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT == null ? semanticCandidateExpression != null : !GroupDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT
-                    .equals(semanticCandidateExpression);
+            .equals(semanticCandidateExpression);
         case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
             return container != null;
         case PropertiesPackage.GROUP_DESCRIPTION__VALIDATION_SET:
@@ -505,7 +505,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupValidationSetDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupValidationSetDescriptionImpl.java
index 609d0240d0..f1c0f7560f 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupValidationSetDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupValidationSetDescriptionImpl.java
@@ -67,7 +67,7 @@ public class GroupValidationSetDescriptionImpl extends MinimalEObjectImpl.Contai
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected GroupValidationSetDescriptionImpl() {
@@ -76,7 +76,7 @@ public class GroupValidationSetDescriptionImpl extends MinimalEObjectImpl.Contai
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -86,7 +86,7 @@ public class GroupValidationSetDescriptionImpl extends MinimalEObjectImpl.Contai
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -100,7 +100,7 @@ public class GroupValidationSetDescriptionImpl extends MinimalEObjectImpl.Contai
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -114,7 +114,7 @@ public class GroupValidationSetDescriptionImpl extends MinimalEObjectImpl.Contai
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -130,7 +130,7 @@ public class GroupValidationSetDescriptionImpl extends MinimalEObjectImpl.Contai
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -146,7 +146,7 @@ public class GroupValidationSetDescriptionImpl extends MinimalEObjectImpl.Contai
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @SuppressWarnings("unchecked")
@@ -167,7 +167,7 @@ public class GroupValidationSetDescriptionImpl extends MinimalEObjectImpl.Contai
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -185,7 +185,7 @@ public class GroupValidationSetDescriptionImpl extends MinimalEObjectImpl.Contai
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelDescriptionImpl.java
index ba6db55d82..954f1ac9d8 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelDescriptionImpl.java
@@ -36,7 +36,7 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
      * The default value of the '{@link #getBodyExpression()
      * <em>Body Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getBodyExpression()
      * @generated
      * @ordered
@@ -47,7 +47,7 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
      * The cached value of the '{@link #getBodyExpression()
      * <em>Body Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getBodyExpression()
      * @generated
      * @ordered
@@ -56,7 +56,7 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected LabelDescriptionImpl() {
@@ -65,7 +65,7 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -75,7 +75,7 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -85,7 +85,7 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -99,7 +99,7 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -113,7 +113,7 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -128,7 +128,7 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -143,7 +143,7 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -157,7 +157,7 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/MultipleReferencesDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/MultipleReferencesDescriptionImpl.java
index 173a83e3cc..60ea9b4d6e 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/MultipleReferencesDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/MultipleReferencesDescriptionImpl.java
@@ -60,7 +60,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
      * The default value of the '{@link #getValueExpression()
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -71,7 +71,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
      * The cached value of the '{@link #getValueExpression()
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -82,7 +82,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
      * The default value of the '{@link #getDisplayExpression()
      * <em>Display Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getDisplayExpression()
      * @generated
      * @ordered
@@ -93,7 +93,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
      * The cached value of the '{@link #getDisplayExpression()
      * <em>Display Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getDisplayExpression()
      * @generated
      * @ordered
@@ -104,7 +104,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
      * The cached value of the '{@link #getCreateOperation()
      * <em>Create Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getCreateOperation()
      * @generated
      * @ordered
@@ -115,7 +115,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
      * The cached value of the '{@link #getSearchOperation()
      * <em>Search Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getSearchOperation()
      * @generated
      * @ordered
@@ -126,7 +126,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
      * The cached value of the '{@link #getUnsetOperation()
      * <em>Unset Operation</em>}' containment reference. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see #getUnsetOperation()
      * @generated
      * @ordered
@@ -137,7 +137,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
      * The cached value of the '{@link #getOnClickOperation()
      * <em>On Click Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getOnClickOperation()
      * @generated
      * @ordered
@@ -147,7 +147,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
     /**
      * The cached value of the '{@link #getUpOperation() <em>Up Operation</em>}'
      * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getUpOperation()
      * @generated
      * @ordered
@@ -158,7 +158,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
      * The cached value of the '{@link #getDownOperation()
      * <em>Down Operation</em>}' containment reference. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see #getDownOperation()
      * @generated
      * @ordered
@@ -167,7 +167,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected MultipleReferencesDescriptionImpl() {
@@ -176,7 +176,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -186,7 +186,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -196,7 +196,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -210,7 +210,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -220,7 +220,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -234,7 +234,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -244,7 +244,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetCreateOperation(OperationDescription newCreateOperation, NotificationChain msgs) {
@@ -263,7 +263,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -289,7 +289,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -299,7 +299,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetSearchOperation(OperationDescription newSearchOperation, NotificationChain msgs) {
@@ -318,7 +318,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -344,7 +344,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -354,7 +354,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetUnsetOperation(OperationDescription newUnsetOperation, NotificationChain msgs) {
@@ -373,7 +373,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -397,7 +397,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -407,7 +407,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetOnClickOperation(OperationDescription newOnClickOperation, NotificationChain msgs) {
@@ -427,7 +427,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -453,7 +453,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -463,7 +463,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetUpOperation(OperationDescription newUpOperation, NotificationChain msgs) {
@@ -482,7 +482,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -506,7 +506,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -516,7 +516,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetDownOperation(OperationDescription newDownOperation, NotificationChain msgs) {
@@ -535,7 +535,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -559,7 +559,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -583,7 +583,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -611,7 +611,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -647,7 +647,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -683,7 +683,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -693,7 +693,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
             return MultipleReferencesDescriptionImpl.VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !MultipleReferencesDescriptionImpl.VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
         case PropertiesPackage.MULTIPLE_REFERENCES_DESCRIPTION__DISPLAY_EXPRESSION:
             return MultipleReferencesDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT == null ? displayExpression != null : !MultipleReferencesDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT
-                    .equals(displayExpression);
+            .equals(displayExpression);
         case PropertiesPackage.MULTIPLE_REFERENCES_DESCRIPTION__CREATE_OPERATION:
             return createOperation != null;
         case PropertiesPackage.MULTIPLE_REFERENCES_DESCRIPTION__SEARCH_OPERATION:
@@ -712,7 +712,7 @@ public class MultipleReferencesDescriptionImpl extends WidgetDescriptionImpl imp
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/OperationDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/OperationDescriptionImpl.java
index cde575e609..6b4f606702 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/OperationDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/OperationDescriptionImpl.java
@@ -40,7 +40,7 @@ public class OperationDescriptionImpl extends MinimalEObjectImpl.Container imple
      * The cached value of the '{@link #getInitialOperation()
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getInitialOperation()
      * @generated
      * @ordered
@@ -49,7 +49,7 @@ public class OperationDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected OperationDescriptionImpl() {
@@ -58,7 +58,7 @@ public class OperationDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -68,7 +68,7 @@ public class OperationDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -78,7 +78,7 @@ public class OperationDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetInitialOperation(InitialOperation newInitialOperation, NotificationChain msgs) {
@@ -97,7 +97,7 @@ public class OperationDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -121,7 +121,7 @@ public class OperationDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -135,7 +135,7 @@ public class OperationDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -149,7 +149,7 @@ public class OperationDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -164,7 +164,7 @@ public class OperationDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -179,7 +179,7 @@ public class OperationDescriptionImpl extends MinimalEObjectImpl.Container imple
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java
index ffd1203681..6ff2db11c6 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java
@@ -58,7 +58,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     /**
      * The default value of the '{@link #getIdentifier() <em>Identifier</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -68,7 +68,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     /**
      * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -79,7 +79,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * The default value of the '{@link #getLabelExpression()
      * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -90,7 +90,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * The cached value of the '{@link #getLabelExpression()
      * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -100,7 +100,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     /**
      * The default value of the '{@link #getDomainClass() <em>Domain Class</em>}
      * ' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getDomainClass()
      * @generated
      * @ordered
@@ -110,7 +110,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     /**
      * The cached value of the '{@link #getDomainClass() <em>Domain Class</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getDomainClass()
      * @generated
      * @ordered
@@ -121,7 +121,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * The default value of the '{@link #getSemanticCandidateExpression()
      * <em>Semantic Candidate Expression</em>}' attribute. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getSemanticCandidateExpression()
      * @generated
      * @ordered
@@ -132,7 +132,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * The cached value of the '{@link #getSemanticCandidateExpression()
      * <em>Semantic Candidate Expression</em>}' attribute. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getSemanticCandidateExpression()
      * @generated
      * @ordered
@@ -142,7 +142,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     /**
      * The cached value of the '{@link #getGroups() <em>Groups</em>}' reference
      * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getGroups()
      * @generated
      * @ordered
@@ -153,7 +153,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * The cached value of the '{@link #getValidationSet()
      * <em>Validation Set</em>}' containment reference. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see #getValidationSet()
      * @generated
      * @ordered
@@ -162,7 +162,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected PageDescriptionImpl() {
@@ -171,7 +171,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -181,7 +181,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -191,7 +191,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -205,7 +205,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -215,7 +215,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -229,7 +229,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -239,7 +239,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -253,7 +253,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -263,7 +263,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -277,7 +277,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -290,7 +290,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -300,7 +300,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetValidationSet(PageValidationSetDescription newValidationSet, NotificationChain msgs) {
@@ -319,7 +319,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -343,7 +343,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -357,7 +357,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -381,7 +381,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @SuppressWarnings("unchecked")
@@ -413,7 +413,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -443,7 +443,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -457,7 +457,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
             return PageDescriptionImpl.DOMAIN_CLASS_EDEFAULT == null ? domainClass != null : !PageDescriptionImpl.DOMAIN_CLASS_EDEFAULT.equals(domainClass);
         case PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
             return PageDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT == null ? semanticCandidateExpression != null : !PageDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT
-                    .equals(semanticCandidateExpression);
+            .equals(semanticCandidateExpression);
         case PropertiesPackage.PAGE_DESCRIPTION__GROUPS:
             return groups != null && !groups.isEmpty();
         case PropertiesPackage.PAGE_DESCRIPTION__VALIDATION_SET:
@@ -468,7 +468,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageValidationSetDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageValidationSetDescriptionImpl.java
index afcb168101..a869c0fcf1 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageValidationSetDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageValidationSetDescriptionImpl.java
@@ -52,7 +52,7 @@ public class PageValidationSetDescriptionImpl extends MinimalEObjectImpl.Contain
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected PageValidationSetDescriptionImpl() {
@@ -61,7 +61,7 @@ public class PageValidationSetDescriptionImpl extends MinimalEObjectImpl.Contain
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -71,7 +71,7 @@ public class PageValidationSetDescriptionImpl extends MinimalEObjectImpl.Contain
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -85,7 +85,7 @@ public class PageValidationSetDescriptionImpl extends MinimalEObjectImpl.Contain
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -99,7 +99,7 @@ public class PageValidationSetDescriptionImpl extends MinimalEObjectImpl.Contain
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -113,7 +113,7 @@ public class PageValidationSetDescriptionImpl extends MinimalEObjectImpl.Contain
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @SuppressWarnings("unchecked")
@@ -130,7 +130,7 @@ public class PageValidationSetDescriptionImpl extends MinimalEObjectImpl.Contain
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -145,7 +145,7 @@ public class PageValidationSetDescriptionImpl extends MinimalEObjectImpl.Contain
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
index 0fa0641017..57611df426 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
@@ -39,19 +39,21 @@ import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.SingleReferenceDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.TextStyle;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
+import org.eclipse.sirius.properties.WidgetStyle;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFactory {
     /**
      * Creates the default factory implementation. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     public static PropertiesFactory init() {
@@ -69,7 +71,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     /**
      * Creates an instance of the factory. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     public PropertiesFactoryImpl() {
@@ -78,7 +80,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -128,6 +130,10 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
             return createCustomExpression();
         case PropertiesPackage.CUSTOM_OPERATION:
             return createCustomOperation();
+        case PropertiesPackage.WIDGET_STYLE:
+            return createWidgetStyle();
+        case PropertiesPackage.TEXT_STYLE:
+            return createTextStyle();
         default:
             throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
         }
@@ -135,7 +141,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -146,7 +152,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -157,7 +163,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -168,7 +174,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -179,7 +185,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -190,7 +196,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -201,7 +207,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -212,7 +218,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -223,7 +229,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -234,7 +240,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -245,7 +251,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -256,7 +262,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -267,7 +273,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -278,7 +284,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -289,7 +295,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -300,7 +306,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -311,7 +317,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -322,7 +328,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -333,7 +339,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -344,7 +350,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -355,7 +361,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -366,7 +372,29 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
+     * @generated
+     */
+    @Override
+    public WidgetStyle createWidgetStyle() {
+        WidgetStyleImpl widgetStyle = new WidgetStyleImpl();
+        return widgetStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public TextStyle createTextStyle() {
+        TextStyleImpl textStyle = new TextStyleImpl();
+        return textStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
      * @generated
      */
     @Override
@@ -377,7 +405,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -387,7 +415,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @deprecated
      * @generated
      */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
index b990f61569..ad693d45eb 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
@@ -40,8 +40,10 @@ import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.SingleReferenceDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.TextStyle;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 import org.eclipse.sirius.properties.WidgetDescription;
+import org.eclipse.sirius.properties.WidgetStyle;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
@@ -50,172 +52,186 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
  * end-user-doc -->
- * 
+ *
  * @generated
  */
 public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPackage {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass viewExtensionDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass pageDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass pageValidationSetDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass propertyValidationRuleEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass groupDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass groupValidationSetDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass containerDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass widgetDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass textDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass buttonDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass labelDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass checkboxDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass selectDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass dynamicMappingForEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass dynamicMappingIfEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass textAreaDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass radioDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass singleReferenceDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass operationDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass multipleReferencesDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass customDescriptionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass customExpressionEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private EClass customOperationEClass = null;
 
     /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass widgetStyleEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass textStyleEClass = null;
+
+    /**
      * Creates an instance of the model <b>Package</b>, registered with
      * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
      * package package URI value.
@@ -236,7 +252,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private static boolean isInited = false;
@@ -286,7 +302,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -296,7 +312,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -306,7 +322,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -316,7 +332,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -326,7 +342,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -336,7 +352,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -346,7 +362,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -356,7 +372,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -366,7 +382,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -376,7 +392,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -386,7 +402,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -396,7 +412,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -406,7 +422,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -416,7 +432,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -426,7 +442,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -436,7 +452,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -446,7 +462,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -456,7 +472,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -466,7 +482,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -476,7 +492,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -486,7 +502,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -496,7 +512,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -506,7 +522,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -516,7 +532,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -526,7 +542,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -536,7 +552,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -546,7 +562,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -556,7 +572,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -566,7 +582,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -576,7 +592,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -586,7 +602,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -596,7 +612,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -606,7 +622,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -616,7 +632,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -626,7 +642,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -636,7 +652,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -646,7 +662,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -656,7 +672,17 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
+     * @generated
+     */
+    @Override
+    public EReference getTextDescription_Style() {
+        return (EReference) textDescriptionEClass.getEStructuralFeatures().get(2);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
      * @generated
      */
     @Override
@@ -666,7 +692,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -676,7 +702,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -686,7 +712,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -696,7 +722,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -706,7 +732,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -716,7 +742,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -726,7 +752,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -736,7 +762,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -746,7 +772,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -756,7 +782,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -766,7 +792,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -776,7 +802,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -786,7 +812,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -796,7 +822,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -806,7 +832,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -816,7 +842,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -826,7 +852,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -836,7 +862,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -846,7 +872,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -856,7 +882,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -866,7 +892,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -876,7 +902,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -886,7 +912,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -896,7 +922,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -906,7 +932,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -916,7 +942,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -926,7 +952,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -936,7 +962,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -946,7 +972,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -956,7 +982,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -966,7 +992,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -976,7 +1002,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -986,7 +1012,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -996,7 +1022,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1006,7 +1032,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1016,7 +1042,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1026,7 +1052,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1036,7 +1062,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1046,7 +1072,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1056,7 +1082,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1066,7 +1092,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1076,7 +1102,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1086,7 +1112,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1096,7 +1122,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1106,7 +1132,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1116,7 +1142,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1126,7 +1152,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1136,7 +1162,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1146,7 +1172,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1156,7 +1182,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1166,7 +1192,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1176,7 +1202,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1186,7 +1212,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -1196,7 +1222,77 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
+     * @generated
+     */
+    @Override
+    public EClass getWidgetStyle() {
+        return widgetStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EClass getTextStyle() {
+        return textStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EAttribute getTextStyle_FontNameExpression() {
+        return (EAttribute) textStyleEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EAttribute getTextStyle_FontSize() {
+        return (EAttribute) textStyleEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getTextStyle_BackgroundColor() {
+        return (EReference) textStyleEClass.getEStructuralFeatures().get(2);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getTextStyle_ForegroundColor() {
+        return (EReference) textStyleEClass.getEStructuralFeatures().get(3);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EAttribute getTextStyle_FontFormat() {
+        return (EAttribute) textStyleEClass.getEStructuralFeatures().get(4);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
      * @generated
      */
     @Override
@@ -1206,7 +1302,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private boolean isCreated = false;
@@ -1215,7 +1311,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * Creates the meta-model objects for the package. This method is guarded to
      * have no affect on any invocation but its first. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public void createPackageContents() {
@@ -1270,6 +1366,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         textDescriptionEClass = createEClass(PropertiesPackage.TEXT_DESCRIPTION);
         createEAttribute(textDescriptionEClass, PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION);
         createEReference(textDescriptionEClass, PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION);
+        createEReference(textDescriptionEClass, PropertiesPackage.TEXT_DESCRIPTION__STYLE);
 
         buttonDescriptionEClass = createEClass(PropertiesPackage.BUTTON_DESCRIPTION);
         createEAttribute(buttonDescriptionEClass, PropertiesPackage.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION);
@@ -1338,11 +1435,20 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         customOperationEClass = createEClass(PropertiesPackage.CUSTOM_OPERATION);
         createEAttribute(customOperationEClass, PropertiesPackage.CUSTOM_OPERATION__IDENTIFIER);
         createEReference(customOperationEClass, PropertiesPackage.CUSTOM_OPERATION__INITIAL_OPERATION);
+
+        widgetStyleEClass = createEClass(PropertiesPackage.WIDGET_STYLE);
+
+        textStyleEClass = createEClass(PropertiesPackage.TEXT_STYLE);
+        createEAttribute(textStyleEClass, PropertiesPackage.TEXT_STYLE__FONT_NAME_EXPRESSION);
+        createEAttribute(textStyleEClass, PropertiesPackage.TEXT_STYLE__FONT_SIZE);
+        createEReference(textStyleEClass, PropertiesPackage.TEXT_STYLE__BACKGROUND_COLOR);
+        createEReference(textStyleEClass, PropertiesPackage.TEXT_STYLE__FOREGROUND_COLOR);
+        createEAttribute(textStyleEClass, PropertiesPackage.TEXT_STYLE__FONT_FORMAT);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     private boolean isInitialized = false;
@@ -1370,6 +1476,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
         ValidationPackage theValidationPackage = (ValidationPackage) EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI);
         ToolPackage theToolPackage = (ToolPackage) EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI);
+        ViewpointPackage theViewpointPackage = (ViewpointPackage) EPackage.Registry.INSTANCE.getEPackage(ViewpointPackage.eNS_URI);
 
         // Create type parameters
 
@@ -1388,6 +1495,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         singleReferenceDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
         multipleReferencesDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
         customDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
+        textStyleEClass.getESuperTypes().add(this.getWidgetStyle());
 
         // Initialize classes and features; add operations and parameters
         initEClass(viewExtensionDescriptionEClass, ViewExtensionDescription.class, "ViewExtensionDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
@@ -1483,6 +1591,9 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEReference(getTextDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, TextDescription.class, !EPackageImpl.IS_TRANSIENT,
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
                 !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getTextDescription_Style(), this.getTextStyle(), null, "style", null, 0, 1, TextDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
 
         initEClass(buttonDescriptionEClass, ButtonDescription.class, "ButtonDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getButtonDescription_ButtonLabelExpression(), theDescriptionPackage.getInterpretedExpression(), "buttonLabelExpression", null, 0, 1, ButtonDescription.class,
@@ -1624,6 +1735,22 @@ 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(widgetStyleEClass, WidgetStyle.class, "WidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+
+        initEClass(textStyleEClass, TextStyle.class, "TextStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getTextStyle_FontNameExpression(), theDescriptionPackage.getInterpretedExpression(), "fontNameExpression", null, 0, 1, TextStyle.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getTextStyle_FontSize(), ecorePackage.getEInt(), "fontSize", null, 0, 1, TextStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
+                !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getTextStyle_BackgroundColor(), theDescriptionPackage.getColorDescription(), null, "backgroundColor", null, 0, 1, TextStyle.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getTextStyle_ForegroundColor(), theDescriptionPackage.getColorDescription(), null, "foregroundColor", null, 0, 1, TextStyle.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getTextStyle_FontFormat(), theViewpointPackage.getFontFormat(), "fontFormat", null, 0, 4, TextStyle.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+
         // Create resource
         createResource(PropertiesPackage.eNS_URI);
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertyValidationRuleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertyValidationRuleImpl.java
index 87f4f924f3..5802836e02 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertyValidationRuleImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertyValidationRuleImpl.java
@@ -39,7 +39,7 @@ public class PropertyValidationRuleImpl extends ValidationRuleImpl implements Pr
     /**
      * The cached value of the '{@link #getTargets() <em>Targets</em>}'
      * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getTargets()
      * @generated
      * @ordered
@@ -48,7 +48,7 @@ public class PropertyValidationRuleImpl extends ValidationRuleImpl implements Pr
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected PropertyValidationRuleImpl() {
@@ -57,7 +57,7 @@ public class PropertyValidationRuleImpl extends ValidationRuleImpl implements Pr
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -67,7 +67,7 @@ public class PropertyValidationRuleImpl extends ValidationRuleImpl implements Pr
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -80,7 +80,7 @@ public class PropertyValidationRuleImpl extends ValidationRuleImpl implements Pr
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -94,7 +94,7 @@ public class PropertyValidationRuleImpl extends ValidationRuleImpl implements Pr
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @SuppressWarnings("unchecked")
@@ -111,7 +111,7 @@ public class PropertyValidationRuleImpl extends ValidationRuleImpl implements Pr
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -126,7 +126,7 @@ public class PropertyValidationRuleImpl extends ValidationRuleImpl implements Pr
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioDescriptionImpl.java
index 7761852c27..ad0a29d7cd 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioDescriptionImpl.java
@@ -48,7 +48,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
      * The default value of the '{@link #getValueExpression()
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -59,7 +59,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
      * The cached value of the '{@link #getValueExpression()
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -70,7 +70,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
      * The cached value of the '{@link #getInitialOperation()
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getInitialOperation()
      * @generated
      * @ordered
@@ -81,7 +81,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
      * The default value of the '{@link #getCandidatesExpression()
      * <em>Candidates Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getCandidatesExpression()
      * @generated
      * @ordered
@@ -92,7 +92,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
      * The cached value of the '{@link #getCandidatesExpression()
      * <em>Candidates Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getCandidatesExpression()
      * @generated
      * @ordered
@@ -103,7 +103,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
      * The default value of the '{@link #getCandidateDisplayExpression()
      * <em>Candidate Display Expression</em>}' attribute. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getCandidateDisplayExpression()
      * @generated
      * @ordered
@@ -114,7 +114,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
      * The cached value of the '{@link #getCandidateDisplayExpression()
      * <em>Candidate Display Expression</em>}' attribute. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getCandidateDisplayExpression()
      * @generated
      * @ordered
@@ -123,7 +123,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected RadioDescriptionImpl() {
@@ -132,7 +132,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -142,7 +142,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -152,7 +152,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -166,7 +166,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -176,7 +176,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetInitialOperation(InitialOperation newInitialOperation, NotificationChain msgs) {
@@ -195,7 +195,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -219,7 +219,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -229,7 +229,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -243,7 +243,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -253,7 +253,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -267,7 +267,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -281,7 +281,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -301,7 +301,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -325,7 +325,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -349,7 +349,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -363,14 +363,14 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
             return RadioDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT == null ? candidatesExpression != null : !RadioDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT.equals(candidatesExpression);
         case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
             return RadioDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT == null ? candidateDisplayExpression != null : !RadioDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT
-                    .equals(candidateDisplayExpression);
+            .equals(candidateDisplayExpression);
         }
         return super.eIsSet(featureID);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java
index bad3bc7f89..a05b12c572 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java
@@ -48,7 +48,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * The default value of the '{@link #getValueExpression()
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -59,7 +59,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * The cached value of the '{@link #getValueExpression()
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -70,7 +70,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * The cached value of the '{@link #getInitialOperation()
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getInitialOperation()
      * @generated
      * @ordered
@@ -81,7 +81,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * The default value of the '{@link #getCandidatesExpression()
      * <em>Candidates Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getCandidatesExpression()
      * @generated
      * @ordered
@@ -92,7 +92,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * The cached value of the '{@link #getCandidatesExpression()
      * <em>Candidates Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getCandidatesExpression()
      * @generated
      * @ordered
@@ -103,7 +103,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * The default value of the '{@link #getCandidateDisplayExpression()
      * <em>Candidate Display Expression</em>}' attribute. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getCandidateDisplayExpression()
      * @generated
      * @ordered
@@ -114,7 +114,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * The cached value of the '{@link #getCandidateDisplayExpression()
      * <em>Candidate Display Expression</em>}' attribute. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getCandidateDisplayExpression()
      * @generated
      * @ordered
@@ -123,7 +123,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected SelectDescriptionImpl() {
@@ -132,7 +132,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -142,7 +142,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -152,7 +152,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -166,7 +166,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -176,7 +176,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetInitialOperation(InitialOperation newInitialOperation, NotificationChain msgs) {
@@ -195,7 +195,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -219,7 +219,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -229,7 +229,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -243,7 +243,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -253,7 +253,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -267,7 +267,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -281,7 +281,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -301,7 +301,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -325,7 +325,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -349,7 +349,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -363,14 +363,14 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
             return SelectDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT == null ? candidatesExpression != null : !SelectDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT.equals(candidatesExpression);
         case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
             return SelectDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT == null ? candidateDisplayExpression != null : !SelectDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT
-                    .equals(candidateDisplayExpression);
+            .equals(candidateDisplayExpression);
         }
         return super.eIsSet(featureID);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SingleReferenceDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SingleReferenceDescriptionImpl.java
index 9b2cf06fd7..f1393ec1fc 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SingleReferenceDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SingleReferenceDescriptionImpl.java
@@ -54,7 +54,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
      * The default value of the '{@link #getValueExpression()
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -65,7 +65,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
      * The cached value of the '{@link #getValueExpression()
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -76,7 +76,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
      * The default value of the '{@link #getDisplayExpression()
      * <em>Display Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getDisplayExpression()
      * @generated
      * @ordered
@@ -87,7 +87,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
      * The cached value of the '{@link #getDisplayExpression()
      * <em>Display Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getDisplayExpression()
      * @generated
      * @ordered
@@ -98,7 +98,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
      * The cached value of the '{@link #getCreateOperation()
      * <em>Create Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getCreateOperation()
      * @generated
      * @ordered
@@ -109,7 +109,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
      * The cached value of the '{@link #getSearchOperation()
      * <em>Search Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getSearchOperation()
      * @generated
      * @ordered
@@ -120,7 +120,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
      * The cached value of the '{@link #getUnsetOperation()
      * <em>Unset Operation</em>}' containment reference. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see #getUnsetOperation()
      * @generated
      * @ordered
@@ -131,7 +131,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
      * The cached value of the '{@link #getOnClickOperation()
      * <em>On Click Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getOnClickOperation()
      * @generated
      * @ordered
@@ -140,7 +140,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected SingleReferenceDescriptionImpl() {
@@ -149,7 +149,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -159,7 +159,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -169,7 +169,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -183,7 +183,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -193,7 +193,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -207,7 +207,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -217,7 +217,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetCreateOperation(OperationDescription newCreateOperation, NotificationChain msgs) {
@@ -236,7 +236,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -260,7 +260,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -270,7 +270,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetSearchOperation(OperationDescription newSearchOperation, NotificationChain msgs) {
@@ -289,7 +289,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -313,7 +313,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -323,7 +323,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetUnsetOperation(OperationDescription newUnsetOperation, NotificationChain msgs) {
@@ -342,7 +342,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -366,7 +366,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -376,7 +376,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetOnClickOperation(OperationDescription newOnClickOperation, NotificationChain msgs) {
@@ -395,7 +395,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -421,7 +421,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -441,7 +441,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -465,7 +465,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -495,7 +495,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -525,7 +525,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -535,7 +535,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
             return SingleReferenceDescriptionImpl.VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !SingleReferenceDescriptionImpl.VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
         case PropertiesPackage.SINGLE_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION:
             return SingleReferenceDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT == null ? displayExpression != null : !SingleReferenceDescriptionImpl.DISPLAY_EXPRESSION_EDEFAULT
-                    .equals(displayExpression);
+            .equals(displayExpression);
         case PropertiesPackage.SINGLE_REFERENCE_DESCRIPTION__CREATE_OPERATION:
             return createOperation != null;
         case PropertiesPackage.SINGLE_REFERENCE_DESCRIPTION__SEARCH_OPERATION:
@@ -550,7 +550,7 @@ public class SingleReferenceDescriptionImpl extends WidgetDescriptionImpl implem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextAreaDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextAreaDescriptionImpl.java
index 773a5b1c61..1aed3caf62 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextAreaDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextAreaDescriptionImpl.java
@@ -35,7 +35,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
     /**
      * The default value of the '{@link #getLineCount() <em>Line Count</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getLineCount()
      * @generated
      * @ordered
@@ -45,7 +45,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
     /**
      * The cached value of the '{@link #getLineCount() <em>Line Count</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getLineCount()
      * @generated
      * @ordered
@@ -54,7 +54,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected TextAreaDescriptionImpl() {
@@ -63,7 +63,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -73,7 +73,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -83,7 +83,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -97,7 +97,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -111,7 +111,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -126,7 +126,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -141,7 +141,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -155,7 +155,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java
index e98631d5ce..6fd29e9954 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.TextStyle;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
@@ -32,6 +33,8 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <li>
  * {@link org.eclipse.sirius.properties.impl.TextDescriptionImpl#getInitialOperation
  * <em>Initial Operation</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.impl.TextDescriptionImpl#getStyle
+ * <em>Style</em>}</li>
  * </ul>
  * </p>
  *
@@ -42,7 +45,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      * The default value of the '{@link #getValueExpression()
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -53,7 +56,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      * The cached value of the '{@link #getValueExpression()
      * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -64,7 +67,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      * The cached value of the '{@link #getInitialOperation()
      * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getInitialOperation()
      * @generated
      * @ordered
@@ -72,8 +75,18 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     protected InitialOperation initialOperation;
 
     /**
+     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getStyle()
+     * @generated
+     * @ordered
+     */
+    protected TextStyle style;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected TextDescriptionImpl() {
@@ -82,7 +95,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -92,7 +105,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -102,7 +115,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -116,7 +129,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -126,7 +139,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public NotificationChain basicSetInitialOperation(InitialOperation newInitialOperation, NotificationChain msgs) {
@@ -145,7 +158,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -169,7 +182,60 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
+     * @generated
+     */
+    @Override
+    public TextStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public NotificationChain basicSetStyle(TextStyle newStyle, NotificationChain msgs) {
+        TextStyle oldStyle = style;
+        style = newStyle;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_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(TextStyle newStyle) {
+        if (newStyle != style) {
+            NotificationChain msgs = null;
+            if (style != null) {
+                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.TEXT_DESCRIPTION__STYLE, null, msgs);
+            }
+            if (newStyle != null) {
+                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.TEXT_DESCRIPTION__STYLE, null, msgs);
+            }
+            msgs = basicSetStyle(newStyle, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_DESCRIPTION__STYLE, newStyle, newStyle));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
      * @generated
      */
     @Override
@@ -177,13 +243,15 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
         switch (featureID) {
         case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
             return basicSetInitialOperation(null, msgs);
+        case PropertiesPackage.TEXT_DESCRIPTION__STYLE:
+            return basicSetStyle(null, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -193,13 +261,15 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
             return getValueExpression();
         case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
             return getInitialOperation();
+        case PropertiesPackage.TEXT_DESCRIPTION__STYLE:
+            return getStyle();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -211,13 +281,16 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
         case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
             setInitialOperation((InitialOperation) newValue);
             return;
+        case PropertiesPackage.TEXT_DESCRIPTION__STYLE:
+            setStyle((TextStyle) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -229,13 +302,16 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
         case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
             setInitialOperation((InitialOperation) null);
             return;
+        case PropertiesPackage.TEXT_DESCRIPTION__STYLE:
+            setStyle((TextStyle) null);
+            return;
         }
         super.eUnset(featureID);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -245,13 +321,15 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
             return TextDescriptionImpl.VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !TextDescriptionImpl.VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
         case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
             return initialOperation != null;
+        case PropertiesPackage.TEXT_DESCRIPTION__STYLE:
+            return style != null;
         }
         return super.eIsSet(featureID);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextStyleImpl.java
new file mode 100644
index 0000000000..3358d703be
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextStyleImpl.java
@@ -0,0 +1,418 @@
+/**
+ * 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.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.EDataTypeUniqueEList;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.TextStyle;
+import org.eclipse.sirius.viewpoint.FontFormat;
+import org.eclipse.sirius.viewpoint.description.ColorDescription;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Text Style</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.TextStyleImpl#getFontNameExpression
+ * <em>Font Name Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.impl.TextStyleImpl#getFontSize <em>
+ * Font Size</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.TextStyleImpl#getBackgroundColor
+ * <em>Background Color</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.TextStyleImpl#getForegroundColor
+ * <em>Foreground Color</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.impl.TextStyleImpl#getFontFormat
+ * <em>Font Format</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TextStyleImpl extends WidgetStyleImpl implements TextStyle {
+    /**
+     * The default value of the '{@link #getFontNameExpression()
+     * <em>Font Name Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see #getFontNameExpression()
+     * @generated
+     * @ordered
+     */
+    protected static final String FONT_NAME_EXPRESSION_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getFontNameExpression()
+     * <em>Font Name Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see #getFontNameExpression()
+     * @generated
+     * @ordered
+     */
+    protected String fontNameExpression = TextStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getFontSize() <em>Font Size</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getFontSize()
+     * @generated
+     * @ordered
+     */
+    protected static final int FONT_SIZE_EDEFAULT = 0;
+
+    /**
+     * The cached value of the '{@link #getFontSize() <em>Font Size</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getFontSize()
+     * @generated
+     * @ordered
+     */
+    protected int fontSize = TextStyleImpl.FONT_SIZE_EDEFAULT;
+
+    /**
+     * The cached value of the '{@link #getBackgroundColor()
+     * <em>Background Color</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see #getBackgroundColor()
+     * @generated
+     * @ordered
+     */
+    protected ColorDescription backgroundColor;
+
+    /**
+     * The cached value of the '{@link #getForegroundColor()
+     * <em>Foreground Color</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see #getForegroundColor()
+     * @generated
+     * @ordered
+     */
+    protected ColorDescription foregroundColor;
+
+    /**
+     * The cached value of the '{@link #getFontFormat() <em>Font Format</em>}'
+     * attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getFontFormat()
+     * @generated
+     * @ordered
+     */
+    protected EList<FontFormat> fontFormat;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected TextStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.TEXT_STYLE;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getFontNameExpression() {
+        return fontNameExpression;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setFontNameExpression(String newFontNameExpression) {
+        String oldFontNameExpression = fontNameExpression;
+        fontNameExpression = newFontNameExpression;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_STYLE__FONT_NAME_EXPRESSION, oldFontNameExpression, fontNameExpression));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public int getFontSize() {
+        return fontSize;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setFontSize(int newFontSize) {
+        int oldFontSize = fontSize;
+        fontSize = newFontSize;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_STYLE__FONT_SIZE, oldFontSize, fontSize));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public ColorDescription getBackgroundColor() {
+        if (backgroundColor != null && backgroundColor.eIsProxy()) {
+            InternalEObject oldBackgroundColor = (InternalEObject) backgroundColor;
+            backgroundColor = (ColorDescription) eResolveProxy(oldBackgroundColor);
+            if (backgroundColor != oldBackgroundColor) {
+                if (eNotificationRequired()) {
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.TEXT_STYLE__BACKGROUND_COLOR, oldBackgroundColor, backgroundColor));
+                }
+            }
+        }
+        return backgroundColor;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public ColorDescription basicGetBackgroundColor() {
+        return backgroundColor;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setBackgroundColor(ColorDescription newBackgroundColor) {
+        ColorDescription oldBackgroundColor = backgroundColor;
+        backgroundColor = newBackgroundColor;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_STYLE__BACKGROUND_COLOR, oldBackgroundColor, backgroundColor));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public ColorDescription getForegroundColor() {
+        if (foregroundColor != null && foregroundColor.eIsProxy()) {
+            InternalEObject oldForegroundColor = (InternalEObject) foregroundColor;
+            foregroundColor = (ColorDescription) eResolveProxy(oldForegroundColor);
+            if (foregroundColor != oldForegroundColor) {
+                if (eNotificationRequired()) {
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.TEXT_STYLE__FOREGROUND_COLOR, oldForegroundColor, foregroundColor));
+                }
+            }
+        }
+        return foregroundColor;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public ColorDescription basicGetForegroundColor() {
+        return foregroundColor;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setForegroundColor(ColorDescription newForegroundColor) {
+        ColorDescription oldForegroundColor = foregroundColor;
+        foregroundColor = newForegroundColor;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_STYLE__FOREGROUND_COLOR, oldForegroundColor, foregroundColor));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EList<FontFormat> getFontFormat() {
+        if (fontFormat == null) {
+            fontFormat = new EDataTypeUniqueEList<FontFormat>(FontFormat.class, this, PropertiesPackage.TEXT_STYLE__FONT_FORMAT);
+        }
+        return fontFormat;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case PropertiesPackage.TEXT_STYLE__FONT_NAME_EXPRESSION:
+            return getFontNameExpression();
+        case PropertiesPackage.TEXT_STYLE__FONT_SIZE:
+            return getFontSize();
+        case PropertiesPackage.TEXT_STYLE__BACKGROUND_COLOR:
+            if (resolve) {
+                return getBackgroundColor();
+            }
+            return basicGetBackgroundColor();
+        case PropertiesPackage.TEXT_STYLE__FOREGROUND_COLOR:
+            if (resolve) {
+                return getForegroundColor();
+            }
+            return basicGetForegroundColor();
+        case PropertiesPackage.TEXT_STYLE__FONT_FORMAT:
+            return getFontFormat();
+        }
+        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.TEXT_STYLE__FONT_NAME_EXPRESSION:
+            setFontNameExpression((String) newValue);
+            return;
+        case PropertiesPackage.TEXT_STYLE__FONT_SIZE:
+            setFontSize((Integer) newValue);
+            return;
+        case PropertiesPackage.TEXT_STYLE__BACKGROUND_COLOR:
+            setBackgroundColor((ColorDescription) newValue);
+            return;
+        case PropertiesPackage.TEXT_STYLE__FOREGROUND_COLOR:
+            setForegroundColor((ColorDescription) newValue);
+            return;
+        case PropertiesPackage.TEXT_STYLE__FONT_FORMAT:
+            getFontFormat().clear();
+            getFontFormat().addAll((Collection<? extends FontFormat>) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.TEXT_STYLE__FONT_NAME_EXPRESSION:
+            setFontNameExpression(TextStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.TEXT_STYLE__FONT_SIZE:
+            setFontSize(TextStyleImpl.FONT_SIZE_EDEFAULT);
+            return;
+        case PropertiesPackage.TEXT_STYLE__BACKGROUND_COLOR:
+            setBackgroundColor((ColorDescription) null);
+            return;
+        case PropertiesPackage.TEXT_STYLE__FOREGROUND_COLOR:
+            setForegroundColor((ColorDescription) null);
+            return;
+        case PropertiesPackage.TEXT_STYLE__FONT_FORMAT:
+            getFontFormat().clear();
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.TEXT_STYLE__FONT_NAME_EXPRESSION:
+            return TextStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT == null ? fontNameExpression != null : !TextStyleImpl.FONT_NAME_EXPRESSION_EDEFAULT.equals(fontNameExpression);
+        case PropertiesPackage.TEXT_STYLE__FONT_SIZE:
+            return fontSize != TextStyleImpl.FONT_SIZE_EDEFAULT;
+        case PropertiesPackage.TEXT_STYLE__BACKGROUND_COLOR:
+            return backgroundColor != null;
+        case PropertiesPackage.TEXT_STYLE__FOREGROUND_COLOR:
+            return foregroundColor != null;
+        case PropertiesPackage.TEXT_STYLE__FONT_FORMAT:
+            return fontFormat != null && !fontFormat.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(" (fontNameExpression: ");
+        result.append(fontNameExpression);
+        result.append(", fontSize: ");
+        result.append(fontSize);
+        result.append(", fontFormat: ");
+        result.append(fontFormat);
+        result.append(')');
+        return result.toString();
+    }
+
+} // TextStyleImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java
index 5ec54c5f79..91514e7e19 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java
@@ -56,7 +56,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     /**
      * The default value of the '{@link #getIdentifier() <em>Identifier</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -66,7 +66,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     /**
      * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -76,7 +76,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     /**
      * The cached value of the '{@link #getMetamodels() <em>Metamodels</em>}'
      * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getMetamodels()
      * @generated
      * @ordered
@@ -86,7 +86,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     /**
      * The cached value of the '{@link #getPages() <em>Pages</em>}' containment
      * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getPages()
      * @generated
      * @ordered
@@ -96,7 +96,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     /**
      * The cached value of the '{@link #getGroups() <em>Groups</em>}'
      * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getGroups()
      * @generated
      * @ordered
@@ -105,7 +105,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ViewExtensionDescriptionImpl() {
@@ -114,7 +114,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -124,7 +124,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -134,7 +134,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -148,7 +148,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -161,7 +161,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -174,7 +174,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -187,7 +187,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -203,7 +203,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -223,7 +223,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @SuppressWarnings("unchecked")
@@ -251,7 +251,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -275,7 +275,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -295,7 +295,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java
index 186a00db0f..deaaec8323 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java
@@ -42,7 +42,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     /**
      * The default value of the '{@link #getIdentifier() <em>Identifier</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -52,7 +52,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     /**
      * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}'
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -63,7 +63,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
      * The default value of the '{@link #getLabelExpression()
      * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -74,7 +74,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
      * The cached value of the '{@link #getLabelExpression()
      * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -85,7 +85,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
      * The default value of the '{@link #getHelpExpression()
      * <em>Help Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getHelpExpression()
      * @generated
      * @ordered
@@ -96,7 +96,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
      * The cached value of the '{@link #getHelpExpression()
      * <em>Help Expression</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @see #getHelpExpression()
      * @generated
      * @ordered
@@ -105,7 +105,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected WidgetDescriptionImpl() {
@@ -114,7 +114,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -124,7 +124,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -134,7 +134,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -148,7 +148,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -158,7 +158,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -172,7 +172,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -182,7 +182,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -196,7 +196,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -214,7 +214,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -235,7 +235,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -256,7 +256,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -274,7 +274,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetStyleImpl.java
new file mode 100644
index 0000000000..b6b00f37d4
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetStyleImpl.java
@@ -0,0 +1,47 @@
+/**
+ * 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.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.WidgetStyle;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Widget Style</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class WidgetStyleImpl extends MinimalEObjectImpl.Container implements WidgetStyle {
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected WidgetStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.WIDGET_STYLE;
+    }
+
+} // WidgetStyleImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
index 220bfe3503..b4d5c99744 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
@@ -37,8 +37,10 @@ import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.SingleReferenceDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.TextStyle;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 import org.eclipse.sirius.properties.WidgetDescription;
+import org.eclipse.sirius.properties.WidgetStyle;
 import org.eclipse.sirius.viewpoint.description.Extension;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
@@ -47,14 +49,14 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
  * an adapter <code>createXXX</code> method for each class of the model. <!--
  * end-user-doc -->
- * 
+ *
  * @see org.eclipse.sirius.properties.PropertiesPackage
  * @generated
  */
 public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     /**
      * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected static PropertiesPackage modelPackage;
@@ -62,7 +64,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     /**
      * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     public PropertiesAdapterFactory() {
@@ -76,7 +78,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * <!-- begin-user-doc --> This implementation returns <code>true</code> if
      * the object is either the model's package or is an instance object of the
      * model. <!-- end-user-doc -->
-     * 
+     *
      * @return whether this factory is applicable for the type of the object.
      * @generated
      */
@@ -214,6 +216,16 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
+        public Adapter caseWidgetStyle(WidgetStyle object) {
+            return createWidgetStyleAdapter();
+        }
+
+        @Override
+        public Adapter caseTextStyle(TextStyle object) {
+            return createTextStyleAdapter();
+        }
+
+        @Override
         public Adapter caseExtension(Extension object) {
             return createExtensionAdapter();
         }
@@ -237,7 +249,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     /**
      * Creates an adapter for the <code>target</code>. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @param target
      *            the object to adapt.
      * @return the adapter for the <code>target</code>.
@@ -255,7 +267,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.ViewExtensionDescription
      * @generated
@@ -271,7 +283,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.PageDescription
      * @generated
@@ -287,7 +299,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.PageValidationSetDescription
      * @generated
@@ -303,7 +315,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.PropertyValidationRule
      * @generated
@@ -319,7 +331,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.GroupDescription
      * @generated
@@ -335,7 +347,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.GroupValidationSetDescription
      * @generated
@@ -351,7 +363,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.ContainerDescription
      * @generated
@@ -367,7 +379,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.WidgetDescription
      * @generated
@@ -383,7 +395,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.TextDescription
      * @generated
@@ -399,7 +411,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.ButtonDescription
      * @generated
@@ -415,7 +427,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.LabelDescription
      * @generated
@@ -431,7 +443,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.CheckboxDescription
      * @generated
@@ -447,7 +459,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.SelectDescription
      * @generated
@@ -463,7 +475,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.DynamicMappingFor
      * @generated
@@ -479,7 +491,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.DynamicMappingIf
      * @generated
@@ -495,7 +507,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.RadioDescription
      * @generated
@@ -511,7 +523,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.SingleReferenceDescription
      * @generated
@@ -527,7 +539,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.OperationDescription
      * @generated
@@ -543,7 +555,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.MultipleReferencesDescription
      * @generated
@@ -559,7 +571,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.CustomDescription
      * @generated
@@ -575,7 +587,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.CustomExpression
      * @generated
@@ -591,7 +603,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.CustomOperation
      * @generated
@@ -602,12 +614,42 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.WidgetStyle <em>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.WidgetStyle
+     * @generated
+     */
+    public Adapter createWidgetStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.TextStyle <em>Text 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.TextStyle
+     * @generated
+     */
+    public Adapter createTextStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
      * {@link org.eclipse.sirius.properties.TextAreaDescription
      * <em>Text Area 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.TextAreaDescription
      * @generated
@@ -639,7 +681,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * 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.viewpoint.description.IdentifiedElement
      * @generated
@@ -667,7 +709,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     /**
      * Creates a new adapter for the default case. <!-- begin-user-doc --> This
      * default implementation returns null. <!-- end-user-doc -->
-     * 
+     *
      * @return the new adapter.
      * @generated
      */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
index 8a809ef19c..167d452113 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
@@ -37,8 +37,10 @@ import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.SingleReferenceDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.TextStyle;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 import org.eclipse.sirius.properties.WidgetDescription;
+import org.eclipse.sirius.properties.WidgetStyle;
 import org.eclipse.sirius.viewpoint.description.Extension;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
@@ -50,14 +52,14 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
  * starting with the actual class of the object and proceeding up the
  * inheritance hierarchy until a non-null result is returned, which is the
  * result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.sirius.properties.PropertiesPackage
  * @generated
  */
 public class PropertiesSwitch<T> {
     /**
      * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected static PropertiesPackage modelPackage;
@@ -65,7 +67,7 @@ public class PropertiesSwitch<T> {
     /**
      * Creates an instance of the switch. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @generated
      */
     public PropertiesSwitch() {
@@ -78,7 +80,7 @@ public class PropertiesSwitch<T> {
      * Calls <code>caseXXX</code> for each class of the model until one returns
      * a non null result; it yields that result. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the first non-null result returned by a <code>caseXXX</code>
      *         call.
      * @generated
@@ -91,7 +93,7 @@ public class PropertiesSwitch<T> {
      * Calls <code>caseXXX</code> for each class of the model until one returns
      * a non null result; it yields that result. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the first non-null result returned by a <code>caseXXX</code>
      *         call.
      * @generated
@@ -109,7 +111,7 @@ public class PropertiesSwitch<T> {
      * Calls <code>caseXXX</code> for each class of the model until one returns
      * a non null result; it yields that result. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
+     *
      * @return the first non-null result returned by a <code>caseXXX</code>
      *         call.
      * @generated
@@ -342,6 +344,25 @@ public class PropertiesSwitch<T> {
             }
             return result;
         }
+        case PropertiesPackage.WIDGET_STYLE: {
+            WidgetStyle widgetStyle = (WidgetStyle) theEObject;
+            T result = caseWidgetStyle(widgetStyle);
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.TEXT_STYLE: {
+            TextStyle textStyle = (TextStyle) theEObject;
+            T result = caseTextStyle(textStyle);
+            if (result == null) {
+                result = caseWidgetStyle(textStyle);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
         default:
             return defaultCase(theEObject);
         }
@@ -352,7 +373,7 @@ public class PropertiesSwitch<T> {
      * <em>View Extension 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 '
@@ -369,7 +390,7 @@ public class PropertiesSwitch<T> {
      * <em>Page 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 '
@@ -386,7 +407,7 @@ public class PropertiesSwitch<T> {
      * <em>Page Validation Set 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 '
@@ -403,7 +424,7 @@ public class PropertiesSwitch<T> {
      * <em>Property Validation Rule</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 '
@@ -420,7 +441,7 @@ public class PropertiesSwitch<T> {
      * <em>Group 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 '
@@ -437,7 +458,7 @@ public class PropertiesSwitch<T> {
      * <em>Group Validation Set 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 '
@@ -454,7 +475,7 @@ public class PropertiesSwitch<T> {
      * <em>Container 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 '
@@ -471,7 +492,7 @@ public class PropertiesSwitch<T> {
      * <em>Widget 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 '
@@ -488,7 +509,7 @@ public class PropertiesSwitch<T> {
      * <em>Text 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 '
@@ -505,7 +526,7 @@ public class PropertiesSwitch<T> {
      * <em>Button 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 '
@@ -522,7 +543,7 @@ public class PropertiesSwitch<T> {
      * <em>Label 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 '
@@ -539,7 +560,7 @@ public class PropertiesSwitch<T> {
      * <em>Checkbox 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 '
@@ -556,7 +577,7 @@ public class PropertiesSwitch<T> {
      * <em>Select 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 '
@@ -573,7 +594,7 @@ public class PropertiesSwitch<T> {
      * <em>Dynamic Mapping For</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 '
@@ -590,7 +611,7 @@ public class PropertiesSwitch<T> {
      * <em>Dynamic Mapping If</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 '
@@ -607,7 +628,7 @@ public class PropertiesSwitch<T> {
      * <em>Radio 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 '
@@ -624,7 +645,7 @@ public class PropertiesSwitch<T> {
      * <em>Single 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 '
@@ -641,7 +662,7 @@ public class PropertiesSwitch<T> {
      * <em>Operation 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 '
@@ -658,7 +679,7 @@ public class PropertiesSwitch<T> {
      * <em>Multiple References 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 '
@@ -675,7 +696,7 @@ public class PropertiesSwitch<T> {
      * <em>Custom 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 '
@@ -692,7 +713,7 @@ public class PropertiesSwitch<T> {
      * <em>Custom Expression</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 '
@@ -709,7 +730,7 @@ public class PropertiesSwitch<T> {
      * <em>Custom Operation</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 '
@@ -723,10 +744,44 @@ public class PropertiesSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
+     * <em>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>Widget Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseWidgetStyle(WidgetStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Text 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>Text Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseTextStyle(TextStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
      * <em>Text Area 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 '
@@ -743,7 +798,7 @@ public class PropertiesSwitch<T> {
      * <em>Extension</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 '
@@ -760,7 +815,7 @@ public class PropertiesSwitch<T> {
      * <em>Identified Element</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 '
@@ -794,7 +849,7 @@ public class PropertiesSwitch<T> {
      * <em>EObject</em>'. <!-- begin-user-doc --> This implementation returns
      * null; returning a non-null result will terminate the switch, but this is
      * the last case anyway. <!-- end-user-doc -->
-     * 
+     *
      * @param object
      *            the target of the switch.
      * @return the result of interpreting the object as an instance of '
diff --git a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/SiriusTabDescriptorProvider.java b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/SiriusTabDescriptorProvider.java
index fca068fcd0..0f639b36c1 100644
--- a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/SiriusTabDescriptorProvider.java
+++ b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/SiriusTabDescriptorProvider.java
@@ -120,7 +120,7 @@ public class SiriusTabDescriptorProvider implements IEEFTabDescriptorProvider {
     }
 
     private Collection<IEEFTabDescriptor> getTabDescriptors(Session session, SiriusInputDescriptor input, List<PageDescription> effectivePageDescriptions) {
-        EEFViewDescription viewDescription = new ViewDescriptionConverter(effectivePageDescriptions).convert();
+        EEFViewDescription viewDescription = new ViewDescriptionConverter(effectivePageDescriptions).convert(input);
         EEFView eefView = createEEFView(session, input, viewDescription);
 
         List<IEEFTabDescriptor> descriptors = new ArrayList<IEEFTabDescriptor>();
diff --git a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
index 9ed3b35f92..bb32039a7a 100644
--- a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
+++ b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
@@ -33,6 +33,7 @@ import org.eclipse.eef.EEFRuleAuditDescription;
 import org.eclipse.eef.EEFSelectDescription;
 import org.eclipse.eef.EEFSemanticValidationRuleDescription;
 import org.eclipse.eef.EEFTextDescription;
+import org.eclipse.eef.EEFTextStyle;
 import org.eclipse.eef.EEFValidationFixDescription;
 import org.eclipse.eef.EEFValidationRuleDescription;
 import org.eclipse.eef.EEFViewDescription;
@@ -42,6 +43,7 @@ import org.eclipse.eef.EefFactory;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.sirius.business.api.color.AbstractColorUpdater;
 import org.eclipse.sirius.properties.ButtonDescription;
 import org.eclipse.sirius.properties.CheckboxDescription;
 import org.eclipse.sirius.properties.CustomDescription;
@@ -58,7 +60,11 @@ import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
+import org.eclipse.sirius.properties.TextStyle;
 import org.eclipse.sirius.properties.WidgetDescription;
+import org.eclipse.sirius.ui.properties.internal.SiriusInputDescriptor;
+import org.eclipse.sirius.viewpoint.RGBValues;
+import org.eclipse.sirius.viewpoint.description.ColorDescription;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 import org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL;
 import org.eclipse.sirius.viewpoint.description.validation.RuleAudit;
@@ -79,8 +85,10 @@ public class ViewDescriptionConverter {
 
     private final List<PageDescription> pageDescriptions;
 
+    private EObject semanticElement;
+
     /**
-     * The contrsuctor.
+     * The constructor.
      * 
      * @param pageDescriptions
      *            The description of the pages to convert
@@ -93,9 +101,12 @@ public class ViewDescriptionConverter {
      * Use the description of the pages provided in order to create an
      * {@link EEFViewDescription}.
      * 
+     * @param input
+     *            Semantic element
+     * 
      * @return The {@link EEFViewDescription} computed
      */
-    public EEFViewDescription convert() {
+    public EEFViewDescription convert(SiriusInputDescriptor input) {
         EEFViewDescription view = EefFactory.eINSTANCE.createEEFViewDescription();
 
         Set<EPackage> ePackages = new LinkedHashSet<>();
@@ -128,7 +139,9 @@ public class ViewDescriptionConverter {
                 }
             }
         }
-
+        if (input != null) {
+            this.semanticElement = input.getSemanticElement();
+        }
         this.widget2eefWidget.clear();
         this.eefPropertyValidationRule2propertyValidationRule.clear();
 
@@ -321,9 +334,57 @@ public class ViewDescriptionConverter {
 
         InitialOperation initialOperation = textDescription.getInitialOperation();
         eefTextDescription.setEditExpression(getExpressionForOperation(initialOperation));
+
+        TextStyle textStyle = textDescription.getStyle();
+        if (textStyle != null) {
+            EEFTextStyle eefTextStyle = EefFactory.eINSTANCE.createEEFTextStyle();
+
+            ColorDescription backgroundColorDescription = textStyle.getBackgroundColor();
+            if (backgroundColorDescription != null) {
+                String backgroundColorExpression = getColorExpression(backgroundColorDescription);
+                if (backgroundColorExpression != null) {
+                    eefTextStyle.setBackgroundColorExpression(backgroundColorExpression);
+                }
+            }
+
+            ColorDescription foregroundColorDescription = textStyle.getForegroundColor();
+            if (foregroundColorDescription != null) {
+                String foregroundColorExpression = getColorExpression(foregroundColorDescription);
+                if (foregroundColorExpression != null) {
+                    eefTextStyle.setForegroundColorExpression(foregroundColorExpression);
+                }
+            }
+
+            eefTextStyle.setFontNameExpression(textStyle.getFontNameExpression());
+            eefTextStyle.setFontSizeExpression(Integer.toString(textStyle.getFontSize()));
+            eefTextStyle.setFontStyleExpression(textStyle.getFontFormat().toString().substring(1, textStyle.getFontFormat().toString().length() - 1));
+
+            eefTextDescription.setStyle(eefTextStyle);
+        }
         return eefTextDescription;
     }
 
+    /**
+     * Get the rgb color expression from a color description.
+     * 
+     * @param colorDescription
+     *            Color description
+     * @return A string representing the color as 'rgb(0,0,0)'
+     */
+    private String getColorExpression(ColorDescription colorDescription) {
+        // TODO To update when new
+        // ColorQuery(colorDescription).getRGBValues(EObject context,
+        // IInterpreter itp) will be available
+        // See bug 490661:
+        // https://bugs.eclipse.org/bugs/show_bug.cgi?id=490661
+        AbstractColorUpdater colorUpdater = new AbstractColorUpdater();
+        RGBValues rgbValues = colorUpdater.getRGBValuesFromColorDescription(this.semanticElement, colorDescription);
+        if (rgbValues != null) {
+            return "rgb(" + rgbValues.getRed() + "," + rgbValues.getGreen() + "," + rgbValues.getBlue() + ")";
+        }
+        return null;
+    }
+
     private String getExpressionForOperation(InitialOperation initialOperation) {
         if (initialOperation != null) {
             return "aql:self.executeOperation('" + EcoreUtil.getURI(initialOperation).toString() + "')";
@@ -388,16 +449,13 @@ public class ViewDescriptionConverter {
         eefRadioDescription.setCandidateDisplayExpression(radioDescription.getCandidateDisplayExpression());
         return eefRadioDescription;
     }
-
+    
     private EEFCustomWidgetDescription createEEFCustomDescription(CustomDescription customDescription) {
         EEFCustomWidgetDescription eefCustomDescription = EefFactory.eINSTANCE.createEEFCustomWidgetDescription();
-
         eefCustomDescription.setIdentifier(customDescription.getIdentifier());
         eefCustomDescription.setLabelExpression(customDescription.getLabelExpression());
-
         for (CustomExpression customExpression : customDescription.getCustomExpressions()) {
             EEFCustomExpression eefCustomExpression = EefFactory.eINSTANCE.createEEFCustomExpression();
-
             eefCustomExpression.setIdentifier(customExpression.getIdentifier());
             String expression = customExpression.getCustomExpression();
             eefCustomExpression.setCustomExpression(expression);
@@ -413,5 +471,4 @@ public class ViewDescriptionConverter {
         }
         return eefCustomDescription;
     }
-
 }