[482528] Support for conditional styles on widgets

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

71 files changed, 7023 insertions, 172 deletions

diff --git a/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml b/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
index 53d4895298..a3a68f00c5 100644
--- a/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
+++ b/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
@@ -338,4 +338,103 @@
    
       </description>
    </context>
+   <context id="CustomWidgetStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code CustomWidgetStyle description -->
+   
+   <!-- End of user code CustomWidgetStyle description -->
+   
+      </description>
+   </context>
+   <context id="WidgetConditionalStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code WidgetConditionalStyle description -->
+   
+   <!-- End of user code WidgetConditionalStyle description -->
+   
+      </description>
+   </context>
+   <context id="TextWidgetConditionalStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code TextWidgetConditionalStyle description -->
+   
+   <!-- End of user code TextWidgetConditionalStyle description -->
+   
+      </description>
+   </context>
+   <context id="LabelWidgetConditionalStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code LabelWidgetConditionalStyle description -->
+   
+   <!-- End of user code LabelWidgetConditionalStyle description -->
+   
+      </description>
+   </context>
+   <context id="CheckboxWidgetConditionalStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code CheckboxWidgetConditionalStyle description -->
+   
+   <!-- End of user code CheckboxWidgetConditionalStyle description -->
+   
+      </description>
+   </context>
+   <context id="RadioWidgetConditionalStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code RadioWidgetConditionalStyle description -->
+   
+   <!-- End of user code RadioWidgetConditionalStyle description -->
+   
+      </description>
+   </context>
+   <context id="ButtonWidgetConditionalStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code ButtonWidgetConditionalStyle description -->
+   
+   <!-- End of user code ButtonWidgetConditionalStyle description -->
+   
+      </description>
+   </context>
+   <context id="SelectWidgetConditionalStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code SelectWidgetConditionalStyle description -->
+   
+   <!-- End of user code SelectWidgetConditionalStyle description -->
+   
+      </description>
+   </context>
+   <context id="CustomWidgetConditionalStyle">
+     <description>
+       
+       
+         
+   <!-- Start of user code CustomWidgetConditionalStyle description -->
+   
+   <!-- End of user code CustomWidgetConditionalStyle 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 ab80b0cdd8..18ca68288a 100644
--- a/incubation/org.eclipse.sirius.editor.properties/plugin.xml
+++ b/incubation/org.eclipse.sirius.editor.properties/plugin.xml
@@ -17,6 +17,13 @@
   <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.widgetconditionalstyle.WidgetConditionalStylePreconditionExpressionPropertySection"
+               id="properties.section.widgetConditionalStyle.PreconditionExpression"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.widgetconditionalstyle.WidgetConditionalStylePreconditionExpressionFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.WidgetConditionalStyle"/>
+      </propertySection>
+  	  <propertySection
                class="org.eclipse.sirius.properties.editor.properties.sections.properties.labelwidgetstyle.LabelWidgetStyleFontFormatPropertySection"
                id="properties.section.labelWidgetStyle.FontFormat"
                filter="org.eclipse.sirius.properties.editor.properties.filters.properties.labelwidgetstyle.LabelWidgetStyleFontFormatFilter"
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetconditionalstyle/WidgetConditionalStylePreconditionExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetconditionalstyle/WidgetConditionalStylePreconditionExpressionFilter.java
new file mode 100644
index 0000000000..4b2e80e154
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetconditionalstyle/WidgetConditionalStylePreconditionExpressionFilter.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.widgetconditionalstyle;
+
+// 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 preconditionExpression property section.
+ */
+public class WidgetConditionalStylePreconditionExpressionFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getWidgetConditionalStyle_PreconditionExpression();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.WidgetConditionalStyle;
+    }
+
+    // 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/widgetconditionalstyle/WidgetConditionalStylePreconditionExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetconditionalstyle/WidgetConditionalStylePreconditionExpressionPropertySection.java
new file mode 100644
index 0000000000..1b5ff58f05
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetconditionalstyle/WidgetConditionalStylePreconditionExpressionPropertySection.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.editor.properties.sections.properties.widgetconditionalstyle;
+
+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 preconditionExpression property of a WidgetConditionalStyle
+ * object.
+ */
+public class WidgetConditionalStylePreconditionExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient {
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "PreconditionExpression"; //$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.getWidgetConditionalStyle_PreconditionExpression();
+    }
+
+    /**
+     * @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(), WidgetConditionalStylePreconditionExpressionPropertySection.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.properties.edit/icons/full/obj16/ButtonWidgetConditionalStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/ButtonWidgetConditionalStyle.gif
new file mode 100644
index 0000000000..d92f34c8ae
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/ButtonWidgetConditionalStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CheckboxWidgetConditionalStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CheckboxWidgetConditionalStyle.gif
new file mode 100644
index 0000000000..4365960a04
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CheckboxWidgetConditionalStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CustomWidgetConditionalStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CustomWidgetConditionalStyle.gif
new file mode 100644
index 0000000000..c673a5200a
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CustomWidgetConditionalStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CustomWidgetStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CustomWidgetStyle.gif
new file mode 100644
index 0000000000..ea58a657dc
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/CustomWidgetStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/LabelWidgetConditionalStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/LabelWidgetConditionalStyle.gif
new file mode 100644
index 0000000000..106881e5d9
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/LabelWidgetConditionalStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/RadioWidgetConditionalStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/RadioWidgetConditionalStyle.gif
new file mode 100644
index 0000000000..5915591825
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/RadioWidgetConditionalStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/SelectWidgetConditionalStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/SelectWidgetConditionalStyle.gif
new file mode 100644
index 0000000000..ed87474740
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/SelectWidgetConditionalStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/TextWidgetConditionalStyle.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/TextWidgetConditionalStyle.gif
new file mode 100644
index 0000000000..35ef84e20e
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/TextWidgetConditionalStyle.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/plugin.properties b/incubation/org.eclipse.sirius.properties.edit/plugin.properties
index c36527e4e5..7e1bcde432 100644
--- a/incubation/org.eclipse.sirius.properties.edit/plugin.properties
+++ b/incubation/org.eclipse.sirius.properties.edit/plugin.properties
@@ -169,3 +169,35 @@ _UI_ButtonDescription_style_feature = Style
 _UI_CheckboxDescription_style_feature = Style
 _UI_SelectDescription_style_feature = Style
 _UI_RadioDescription_style_feature = Style
+_UI_WidgetConditionalStyle_type = Widget Conditional Style
+_UI_TextWidgetConditionalStyle_type = Text Widget Conditional Style
+_UI_TextDescription_conditionalStyles_feature = Conditional Styles
+_UI_WidgetConditionalStyle_preconditionExpression_feature = Precondition Expression
+_UI_TextWidgetConditionalStyle_style_feature = Style
+_UI_TextDescription_style2_feature = Style2
+_UI_TextDescription_conditionalStyle_feature = Conditional Style
+_UI_LabelWidgetConditionalStyle_type = Label Widget Conditional Style
+_UI_CheckboxWidgetConditionalStyle_type = Checkbox Widget Conditional Style
+_UI_RadioWidgetConditionalStyle_type = Radio Widget Conditional Style
+_UI_ButtonWidgetConditionalStyle_type = Button Widget Conditional Style
+_UI_SelectWidgetConditionalStyle_type = Select Widget Conditional Style
+_UI_ButtonDescription_conditionalStyle_feature = Conditional Style
+_UI_LabelDescription_conditionalStyle_feature = Conditional Style
+_UI_CheckboxDescription_conditionalStyle_feature = Conditional Style
+_UI_SelectDescription_conditionalStyle_feature = Conditional Style
+_UI_LabelWidgetConditionalStyle_style_feature = Style
+_UI_CheckboxWidgetConditionalStyle_style_feature = Style
+_UI_RadioWidgetConditionalStyle_style_feature = Style
+_UI_ButtonWidgetConditionalStyle_style_feature = Style
+_UI_SelectWidgetConditionalStyle_style_feature = Style
+_UI_RadioDescription_conditionalStyle_feature = Conditional Style
+_UI_ButtonDescription_conditionalStyles_feature = Conditional Styles
+_UI_LabelDescription_conditionalStyles_feature = Conditional Styles
+_UI_CheckboxDescription_conditionalStyles_feature = Conditional Styles
+_UI_SelectDescription_conditionalStyles_feature = Conditional Styles
+_UI_RadioDescription_conditionalStyles_feature = Conditional Styles
+_UI_CustomWidgetStyle_type = Custom Widget Style
+_UI_CustomWidgetConditionalStyle_type = Custom Widget Conditional Style
+_UI_CustomDescription_style_feature = Style
+_UI_CustomDescription_conditionalStyles_feature = Conditional Styles
+_UI_CustomWidgetConditionalStyle_style_feature = Style
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 349d9006a5..2ee8660b34 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
@@ -89,6 +89,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
             super.getChildrenFeatures(object);
             childrenFeatures.add(PropertiesPackage.Literals.BUTTON_DESCRIPTION__INITIAL_OPERATION);
             childrenFeatures.add(PropertiesPackage.Literals.BUTTON_DESCRIPTION__STYLE);
+            childrenFeatures.add(PropertiesPackage.Literals.BUTTON_DESCRIPTION__CONDITIONAL_STYLES);
         }
         return childrenFeatures;
     }
@@ -148,6 +149,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
             return;
         case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
         case PropertiesPackage.BUTTON_DESCRIPTION__STYLE:
+        case PropertiesPackage.BUTTON_DESCRIPTION__CONDITIONAL_STYLES:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
             return;
         }
@@ -168,6 +170,8 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.BUTTON_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.BUTTON_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createButtonWidgetStyle()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.BUTTON_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createButtonWidgetConditionalStyle()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonWidgetConditionalStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonWidgetConditionalStyleItemProvider.java
new file mode 100644
index 0000000000..3b1e3d9b4a
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonWidgetConditionalStyleItemProvider.java
@@ -0,0 +1,149 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.properties.ButtonWidgetConditionalStyle;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.ButtonWidgetConditionalStyle} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ButtonWidgetConditionalStyleItemProvider extends WidgetConditionalStyleItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public ButtonWidgetConditionalStyleItemProvider(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+        if (itemPropertyDescriptors == null) {
+            super.getPropertyDescriptors(object);
+
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This specifies how to implement {@link #getChildren} and is used to
+     * deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand},
+     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in
+     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+        if (childrenFeatures == null) {
+            super.getChildrenFeatures(object);
+            childrenFeatures.add(PropertiesPackage.Literals.BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE);
+        }
+        return childrenFeatures;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EStructuralFeature getChildFeature(Object object, Object child) {
+        // Check the type of the specified child object and return the proper
+        // feature to use for
+        // adding (see {@link AddCommand}) it as a child.
+
+        return super.getChildFeature(object, child);
+    }
+
+    /**
+     * This returns ButtonWidgetConditionalStyle.gif. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ButtonWidgetConditionalStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((ButtonWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_ButtonWidgetConditionalStyle_type") : getString("_UI_ButtonWidgetConditionalStyle_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(ButtonWidgetConditionalStyle.class)) {
+        case PropertiesPackage.BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+            return;
+        }
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE, PropertiesFactory.eINSTANCE.createButtonWidgetStyle()));
+    }
+
+}
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 a9c002d326..93e0809339 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
@@ -89,6 +89,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
             super.getChildrenFeatures(object);
             childrenFeatures.add(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__INITIAL_OPERATION);
             childrenFeatures.add(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__STYLE);
+            childrenFeatures.add(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES);
         }
         return childrenFeatures;
     }
@@ -148,6 +149,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
             return;
         case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
         case PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE:
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
             return;
         }
@@ -168,6 +170,8 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createCheckboxWidgetStyle()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createCheckboxWidgetConditionalStyle()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxWidgetConditionalStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxWidgetConditionalStyleItemProvider.java
new file mode 100644
index 0000000000..89aa3684a8
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxWidgetConditionalStyleItemProvider.java
@@ -0,0 +1,149 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CheckboxWidgetConditionalStyleItemProvider extends WidgetConditionalStyleItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public CheckboxWidgetConditionalStyleItemProvider(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+        if (itemPropertyDescriptors == null) {
+            super.getPropertyDescriptors(object);
+
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This specifies how to implement {@link #getChildren} and is used to
+     * deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand},
+     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in
+     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+        if (childrenFeatures == null) {
+            super.getChildrenFeatures(object);
+            childrenFeatures.add(PropertiesPackage.Literals.CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE);
+        }
+        return childrenFeatures;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EStructuralFeature getChildFeature(Object object, Object child) {
+        // Check the type of the specified child object and return the proper
+        // feature to use for
+        // adding (see {@link AddCommand}) it as a child.
+
+        return super.getChildFeature(object, child);
+    }
+
+    /**
+     * This returns CheckboxWidgetConditionalStyle.gif. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CheckboxWidgetConditionalStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((CheckboxWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_CheckboxWidgetConditionalStyle_type") : getString("_UI_CheckboxWidgetConditionalStyle_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(CheckboxWidgetConditionalStyle.class)) {
+        case PropertiesPackage.CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+            return;
+        }
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE, PropertiesFactory.eINSTANCE.createCheckboxWidgetStyle()));
+    }
+
+}
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 cd45342989..3d7d1db5f7 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
@@ -72,6 +72,8 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
             super.getChildrenFeatures(object);
             childrenFeatures.add(PropertiesPackage.Literals.CUSTOM_DESCRIPTION__CUSTOM_EXPRESSIONS);
             childrenFeatures.add(PropertiesPackage.Literals.CUSTOM_DESCRIPTION__CUSTOM_OPERATIONS);
+            childrenFeatures.add(PropertiesPackage.Literals.CUSTOM_DESCRIPTION__STYLE);
+            childrenFeatures.add(PropertiesPackage.Literals.CUSTOM_DESCRIPTION__CONDITIONAL_STYLES);
         }
         return childrenFeatures;
     }
@@ -128,6 +130,8 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
         switch (notification.getFeatureID(CustomDescription.class)) {
         case PropertiesPackage.CUSTOM_DESCRIPTION__CUSTOM_EXPRESSIONS:
         case PropertiesPackage.CUSTOM_DESCRIPTION__CUSTOM_OPERATIONS:
+        case PropertiesPackage.CUSTOM_DESCRIPTION__STYLE:
+        case PropertiesPackage.CUSTOM_DESCRIPTION__CONDITIONAL_STYLES:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
             return;
         }
@@ -148,6 +152,10 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CUSTOM_DESCRIPTION__CUSTOM_EXPRESSIONS, PropertiesFactory.eINSTANCE.createCustomExpression()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CUSTOM_DESCRIPTION__CUSTOM_OPERATIONS, PropertiesFactory.eINSTANCE.createCustomOperation()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CUSTOM_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createCustomWidgetStyle()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CUSTOM_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createCustomWidgetConditionalStyle()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomWidgetConditionalStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomWidgetConditionalStyleItemProvider.java
new file mode 100644
index 0000000000..af315fd99e
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomWidgetConditionalStyleItemProvider.java
@@ -0,0 +1,149 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.properties.CustomWidgetConditionalStyle;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.CustomWidgetConditionalStyle} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CustomWidgetConditionalStyleItemProvider extends WidgetConditionalStyleItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public CustomWidgetConditionalStyleItemProvider(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+        if (itemPropertyDescriptors == null) {
+            super.getPropertyDescriptors(object);
+
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This specifies how to implement {@link #getChildren} and is used to
+     * deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand},
+     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in
+     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+        if (childrenFeatures == null) {
+            super.getChildrenFeatures(object);
+            childrenFeatures.add(PropertiesPackage.Literals.CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE);
+        }
+        return childrenFeatures;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EStructuralFeature getChildFeature(Object object, Object child) {
+        // Check the type of the specified child object and return the proper
+        // feature to use for
+        // adding (see {@link AddCommand}) it as a child.
+
+        return super.getChildFeature(object, child);
+    }
+
+    /**
+     * This returns CustomWidgetConditionalStyle.gif. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomWidgetConditionalStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((CustomWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_CustomWidgetConditionalStyle_type") : getString("_UI_CustomWidgetConditionalStyle_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(CustomWidgetConditionalStyle.class)) {
+        case PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+            return;
+        }
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE, PropertiesFactory.eINSTANCE.createCustomWidgetStyle()));
+    }
+
+}
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomWidgetStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomWidgetStyleItemProvider.java
new file mode 100644
index 0000000000..3932dc8ab7
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomWidgetStyleItemProvider.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.properties.CustomWidgetStyle;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.CustomWidgetStyle} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CustomWidgetStyleItemProvider extends WidgetStyleItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public CustomWidgetStyleItemProvider(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 CustomWidgetStyle.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomWidgetStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((CustomWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_CustomWidgetStyle_type") : getString("_UI_CustomWidgetStyle_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);
+        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/LabelDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
index fa9b5b635a..9e022205a8 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
@@ -86,6 +86,7 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
         if (childrenFeatures == null) {
             super.getChildrenFeatures(object);
             childrenFeatures.add(PropertiesPackage.Literals.LABEL_DESCRIPTION__STYLE);
+            childrenFeatures.add(PropertiesPackage.Literals.LABEL_DESCRIPTION__CONDITIONAL_STYLES);
         }
         return childrenFeatures;
     }
@@ -144,6 +145,7 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
             return;
         case PropertiesPackage.LABEL_DESCRIPTION__STYLE:
+        case PropertiesPackage.LABEL_DESCRIPTION__CONDITIONAL_STYLES:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
             return;
         }
@@ -162,6 +164,8 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.LABEL_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createLabelWidgetStyle()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.LABEL_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createLabelWidgetConditionalStyle()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelWidgetConditionalStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelWidgetConditionalStyleItemProvider.java
new file mode 100644
index 0000000000..febbf3cf25
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelWidgetConditionalStyleItemProvider.java
@@ -0,0 +1,149 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.properties.LabelWidgetConditionalStyle;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.LabelWidgetConditionalStyle} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class LabelWidgetConditionalStyleItemProvider extends WidgetConditionalStyleItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public LabelWidgetConditionalStyleItemProvider(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+        if (itemPropertyDescriptors == null) {
+            super.getPropertyDescriptors(object);
+
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This specifies how to implement {@link #getChildren} and is used to
+     * deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand},
+     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in
+     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+        if (childrenFeatures == null) {
+            super.getChildrenFeatures(object);
+            childrenFeatures.add(PropertiesPackage.Literals.LABEL_WIDGET_CONDITIONAL_STYLE__STYLE);
+        }
+        return childrenFeatures;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EStructuralFeature getChildFeature(Object object, Object child) {
+        // Check the type of the specified child object and return the proper
+        // feature to use for
+        // adding (see {@link AddCommand}) it as a child.
+
+        return super.getChildFeature(object, child);
+    }
+
+    /**
+     * This returns LabelWidgetConditionalStyle.gif. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelWidgetConditionalStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((LabelWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_LabelWidgetConditionalStyle_type") : getString("_UI_LabelWidgetConditionalStyle_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(LabelWidgetConditionalStyle.class)) {
+        case PropertiesPackage.LABEL_WIDGET_CONDITIONAL_STYLE__STYLE:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+            return;
+        }
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.LABEL_WIDGET_CONDITIONAL_STYLE__STYLE, PropertiesFactory.eINSTANCE.createLabelWidgetStyle()));
+    }
+
+}
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 b810310280..35cf1a3942 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
@@ -820,6 +820,206 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.CustomWidgetStyle} instances. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected CustomWidgetStyleItemProvider customWidgetStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.CustomWidgetStyle}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createCustomWidgetStyleAdapter() {
+        if (customWidgetStyleItemProvider == null) {
+            customWidgetStyleItemProvider = new CustomWidgetStyleItemProvider(this);
+        }
+
+        return customWidgetStyleItemProvider;
+    }
+
+    /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.TextWidgetConditionalStyle}
+     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected TextWidgetConditionalStyleItemProvider textWidgetConditionalStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.TextWidgetConditionalStyle}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createTextWidgetConditionalStyleAdapter() {
+        if (textWidgetConditionalStyleItemProvider == null) {
+            textWidgetConditionalStyleItemProvider = new TextWidgetConditionalStyleItemProvider(this);
+        }
+
+        return textWidgetConditionalStyleItemProvider;
+    }
+
+    /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.LabelWidgetConditionalStyle}
+     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected LabelWidgetConditionalStyleItemProvider labelWidgetConditionalStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.LabelWidgetConditionalStyle}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createLabelWidgetConditionalStyleAdapter() {
+        if (labelWidgetConditionalStyleItemProvider == null) {
+            labelWidgetConditionalStyleItemProvider = new LabelWidgetConditionalStyleItemProvider(this);
+        }
+
+        return labelWidgetConditionalStyleItemProvider;
+    }
+
+    /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle}
+     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected CheckboxWidgetConditionalStyleItemProvider checkboxWidgetConditionalStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createCheckboxWidgetConditionalStyleAdapter() {
+        if (checkboxWidgetConditionalStyleItemProvider == null) {
+            checkboxWidgetConditionalStyleItemProvider = new CheckboxWidgetConditionalStyleItemProvider(this);
+        }
+
+        return checkboxWidgetConditionalStyleItemProvider;
+    }
+
+    /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.RadioWidgetConditionalStyle}
+     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected RadioWidgetConditionalStyleItemProvider radioWidgetConditionalStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.RadioWidgetConditionalStyle}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createRadioWidgetConditionalStyleAdapter() {
+        if (radioWidgetConditionalStyleItemProvider == null) {
+            radioWidgetConditionalStyleItemProvider = new RadioWidgetConditionalStyleItemProvider(this);
+        }
+
+        return radioWidgetConditionalStyleItemProvider;
+    }
+
+    /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.ButtonWidgetConditionalStyle}
+     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected ButtonWidgetConditionalStyleItemProvider buttonWidgetConditionalStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.ButtonWidgetConditionalStyle}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createButtonWidgetConditionalStyleAdapter() {
+        if (buttonWidgetConditionalStyleItemProvider == null) {
+            buttonWidgetConditionalStyleItemProvider = new ButtonWidgetConditionalStyleItemProvider(this);
+        }
+
+        return buttonWidgetConditionalStyleItemProvider;
+    }
+
+    /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.SelectWidgetConditionalStyle}
+     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected SelectWidgetConditionalStyleItemProvider selectWidgetConditionalStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.SelectWidgetConditionalStyle}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createSelectWidgetConditionalStyleAdapter() {
+        if (selectWidgetConditionalStyleItemProvider == null) {
+            selectWidgetConditionalStyleItemProvider = new SelectWidgetConditionalStyleItemProvider(this);
+        }
+
+        return selectWidgetConditionalStyleItemProvider;
+    }
+
+    /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.CustomWidgetConditionalStyle}
+     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected CustomWidgetConditionalStyleItemProvider customWidgetConditionalStyleItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.CustomWidgetConditionalStyle}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createCustomWidgetConditionalStyleAdapter() {
+        if (customWidgetConditionalStyleItemProvider == null) {
+            customWidgetConditionalStyleItemProvider = new CustomWidgetConditionalStyleItemProvider(this);
+        }
+
+        return customWidgetConditionalStyleItemProvider;
+    }
+
+    /**
      * This returns the root adapter factory that contains this factory. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -1010,6 +1210,30 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
         if (selectWidgetStyleItemProvider != null) {
             selectWidgetStyleItemProvider.dispose();
         }
+        if (customWidgetStyleItemProvider != null) {
+            customWidgetStyleItemProvider.dispose();
+        }
+        if (textWidgetConditionalStyleItemProvider != null) {
+            textWidgetConditionalStyleItemProvider.dispose();
+        }
+        if (labelWidgetConditionalStyleItemProvider != null) {
+            labelWidgetConditionalStyleItemProvider.dispose();
+        }
+        if (checkboxWidgetConditionalStyleItemProvider != null) {
+            checkboxWidgetConditionalStyleItemProvider.dispose();
+        }
+        if (radioWidgetConditionalStyleItemProvider != null) {
+            radioWidgetConditionalStyleItemProvider.dispose();
+        }
+        if (buttonWidgetConditionalStyleItemProvider != null) {
+            buttonWidgetConditionalStyleItemProvider.dispose();
+        }
+        if (selectWidgetConditionalStyleItemProvider != null) {
+            selectWidgetConditionalStyleItemProvider.dispose();
+        }
+        if (customWidgetConditionalStyleItemProvider != null) {
+            customWidgetConditionalStyleItemProvider.dispose();
+        }
     }
 
     /**
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 57e792bb24..2533d9dd64 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
@@ -129,6 +129,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
             super.getChildrenFeatures(object);
             childrenFeatures.add(PropertiesPackage.Literals.RADIO_DESCRIPTION__INITIAL_OPERATION);
             childrenFeatures.add(PropertiesPackage.Literals.RADIO_DESCRIPTION__STYLE);
+            childrenFeatures.add(PropertiesPackage.Literals.RADIO_DESCRIPTION__CONDITIONAL_STYLES);
         }
         return childrenFeatures;
     }
@@ -191,6 +192,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
             return;
         case PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION:
         case PropertiesPackage.RADIO_DESCRIPTION__STYLE:
+        case PropertiesPackage.RADIO_DESCRIPTION__CONDITIONAL_STYLES:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
             return;
         }
@@ -211,6 +213,8 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.RADIO_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.RADIO_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createRadioWidgetStyle()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.RADIO_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createRadioWidgetConditionalStyle()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioWidgetConditionalStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioWidgetConditionalStyleItemProvider.java
new file mode 100644
index 0000000000..72d0174687
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioWidgetConditionalStyleItemProvider.java
@@ -0,0 +1,149 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.RadioWidgetConditionalStyle} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class RadioWidgetConditionalStyleItemProvider extends WidgetConditionalStyleItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public RadioWidgetConditionalStyleItemProvider(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+        if (itemPropertyDescriptors == null) {
+            super.getPropertyDescriptors(object);
+
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This specifies how to implement {@link #getChildren} and is used to
+     * deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand},
+     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in
+     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+        if (childrenFeatures == null) {
+            super.getChildrenFeatures(object);
+            childrenFeatures.add(PropertiesPackage.Literals.RADIO_WIDGET_CONDITIONAL_STYLE__STYLE);
+        }
+        return childrenFeatures;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EStructuralFeature getChildFeature(Object object, Object child) {
+        // Check the type of the specified child object and return the proper
+        // feature to use for
+        // adding (see {@link AddCommand}) it as a child.
+
+        return super.getChildFeature(object, child);
+    }
+
+    /**
+     * This returns RadioWidgetConditionalStyle.gif. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/RadioWidgetConditionalStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((RadioWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_RadioWidgetConditionalStyle_type") : getString("_UI_RadioWidgetConditionalStyle_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(RadioWidgetConditionalStyle.class)) {
+        case PropertiesPackage.RADIO_WIDGET_CONDITIONAL_STYLE__STYLE:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+            return;
+        }
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.RADIO_WIDGET_CONDITIONAL_STYLE__STYLE, PropertiesFactory.eINSTANCE.createRadioWidgetStyle()));
+    }
+
+}
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 1ab2828f9b..396a1c34c2 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
@@ -117,6 +117,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
             super.getChildrenFeatures(object);
             childrenFeatures.add(PropertiesPackage.Literals.SELECT_DESCRIPTION__INITIAL_OPERATION);
             childrenFeatures.add(PropertiesPackage.Literals.SELECT_DESCRIPTION__STYLE);
+            childrenFeatures.add(PropertiesPackage.Literals.SELECT_DESCRIPTION__CONDITIONAL_STYLES);
         }
         return childrenFeatures;
     }
@@ -178,6 +179,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
             return;
         case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
         case PropertiesPackage.SELECT_DESCRIPTION__STYLE:
+        case PropertiesPackage.SELECT_DESCRIPTION__CONDITIONAL_STYLES:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
             return;
         }
@@ -198,6 +200,8 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.SELECT_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.SELECT_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createSelectWidgetStyle()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.SELECT_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createSelectWidgetConditionalStyle()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectWidgetConditionalStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectWidgetConditionalStyleItemProvider.java
new file mode 100644
index 0000000000..93fdb8e570
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectWidgetConditionalStyleItemProvider.java
@@ -0,0 +1,149 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.SelectWidgetConditionalStyle} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SelectWidgetConditionalStyleItemProvider extends WidgetConditionalStyleItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public SelectWidgetConditionalStyleItemProvider(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+        if (itemPropertyDescriptors == null) {
+            super.getPropertyDescriptors(object);
+
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This specifies how to implement {@link #getChildren} and is used to
+     * deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand},
+     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in
+     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+        if (childrenFeatures == null) {
+            super.getChildrenFeatures(object);
+            childrenFeatures.add(PropertiesPackage.Literals.SELECT_WIDGET_CONDITIONAL_STYLE__STYLE);
+        }
+        return childrenFeatures;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EStructuralFeature getChildFeature(Object object, Object child) {
+        // Check the type of the specified child object and return the proper
+        // feature to use for
+        // adding (see {@link AddCommand}) it as a child.
+
+        return super.getChildFeature(object, child);
+    }
+
+    /**
+     * This returns SelectWidgetConditionalStyle.gif. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/SelectWidgetConditionalStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((SelectWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_SelectWidgetConditionalStyle_type") : getString("_UI_SelectWidgetConditionalStyle_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(SelectWidgetConditionalStyle.class)) {
+        case PropertiesPackage.SELECT_WIDGET_CONDITIONAL_STYLE__STYLE:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+            return;
+        }
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.SELECT_WIDGET_CONDITIONAL_STYLE__STYLE, PropertiesFactory.eINSTANCE.createSelectWidgetStyle()));
+    }
+
+}
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 5017a951ac..ea0c5208e1 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
@@ -88,6 +88,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
             super.getChildrenFeatures(object);
             childrenFeatures.add(PropertiesPackage.Literals.TEXT_DESCRIPTION__INITIAL_OPERATION);
             childrenFeatures.add(PropertiesPackage.Literals.TEXT_DESCRIPTION__STYLE);
+            childrenFeatures.add(PropertiesPackage.Literals.TEXT_DESCRIPTION__CONDITIONAL_STYLES);
         }
         return childrenFeatures;
     }
@@ -147,6 +148,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
             return;
         case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
         case PropertiesPackage.TEXT_DESCRIPTION__STYLE:
+        case PropertiesPackage.TEXT_DESCRIPTION__CONDITIONAL_STYLES:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
             return;
         }
@@ -167,6 +169,8 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createTextWidgetStyle()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createTextWidgetConditionalStyle()));
     }
 
 }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextWidgetConditionalStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextWidgetConditionalStyleItemProvider.java
new file mode 100644
index 0000000000..99ceed3333
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextWidgetConditionalStyleItemProvider.java
@@ -0,0 +1,149 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.TextWidgetConditionalStyle;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.TextWidgetConditionalStyle} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class TextWidgetConditionalStyleItemProvider extends WidgetConditionalStyleItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public TextWidgetConditionalStyleItemProvider(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+        if (itemPropertyDescriptors == null) {
+            super.getPropertyDescriptors(object);
+
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This specifies how to implement {@link #getChildren} and is used to
+     * deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand},
+     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in
+     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+        if (childrenFeatures == null) {
+            super.getChildrenFeatures(object);
+            childrenFeatures.add(PropertiesPackage.Literals.TEXT_WIDGET_CONDITIONAL_STYLE__STYLE);
+        }
+        return childrenFeatures;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EStructuralFeature getChildFeature(Object object, Object child) {
+        // Check the type of the specified child object and return the proper
+        // feature to use for
+        // adding (see {@link AddCommand}) it as a child.
+
+        return super.getChildFeature(object, child);
+    }
+
+    /**
+     * This returns TextWidgetConditionalStyle.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/TextWidgetConditionalStyle"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((TextWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_TextWidgetConditionalStyle_type") : getString("_UI_TextWidgetConditionalStyle_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(TextWidgetConditionalStyle.class)) {
+        case PropertiesPackage.TEXT_WIDGET_CONDITIONAL_STYLE__STYLE:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+            return;
+        }
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_WIDGET_CONDITIONAL_STYLE__STYLE, PropertiesFactory.eINSTANCE.createTextWidgetStyle()));
+    }
+
+}
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetConditionalStyleItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetConditionalStyleItemProvider.java
new file mode 100644
index 0000000000..b37f97e7a7
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetConditionalStyleItemProvider.java
@@ -0,0 +1,136 @@
+/**
+ * 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.ComposeableAdapterFactory;
+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.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.WidgetConditionalStyle;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.WidgetConditionalStyle} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class WidgetConditionalStyleItemProvider 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 WidgetConditionalStyleItemProvider(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);
+
+            addPreconditionExpressionPropertyDescriptor(object);
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This adds a property descriptor for the Precondition Expression feature.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addPreconditionExpressionPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_WidgetConditionalStyle_preconditionExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_WidgetConditionalStyle_preconditionExpression_feature", "_UI_WidgetConditionalStyle_type"),
+                PropertiesPackage.Literals.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((WidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_WidgetConditionalStyle_type") : getString("_UI_WidgetConditionalStyle_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(WidgetConditionalStyle.class)) {
+        case PropertiesPackage.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION:
+            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);
+    }
+
+    /**
+     * 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 ed973b8532..4125b7c7f8 100644
--- a/incubation/org.eclipse.sirius.properties/model/properties.ecore
+++ b/incubation/org.eclipse.sirius.properties/model/properties.ecore
@@ -77,6 +77,8 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//TextWidgetStyle"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionalStyles" upperBound="-1"
+        eType="#//TextWidgetConditionalStyle" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ButtonDescription" eSuperTypes="#//WidgetDescription">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="buttonLabelExpression"
@@ -86,11 +88,15 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//ButtonWidgetStyle"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionalStyles" upperBound="-1"
+        eType="#//ButtonWidgetConditionalStyle" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="LabelDescription" eSuperTypes="#//WidgetDescription">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="bodyExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//LabelWidgetStyle"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionalStyles" upperBound="-1"
+        eType="#//LabelWidgetConditionalStyle" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CheckboxDescription" eSuperTypes="#//WidgetDescription">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
@@ -99,6 +105,8 @@
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//CheckboxWidgetStyle"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionalStyles" upperBound="-1"
+        eType="#//CheckboxWidgetConditionalStyle" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SelectDescription" eSuperTypes="#//WidgetDescription">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -129,6 +137,8 @@
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//SelectWidgetStyle"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionalStyles" upperBound="-1"
+        eType="#//SelectWidgetConditionalStyle" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="DynamicMappingFor">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="iterator" lowerBound="1"
@@ -186,6 +196,8 @@
         <details key="documentation" value="The number of columns to use to display the candidates."/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionalStyles" upperBound="-1"
+        eType="#//RadioWidgetConditionalStyle" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SingleReferenceDescription" eSuperTypes="#//WidgetDescription">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -263,6 +275,10 @@
         eType="#//CustomExpression" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="customOperations" upperBound="-1"
         eType="#//CustomOperation" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//CustomWidgetStyle"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionalStyles" upperBound="-1"
+        eType="#//CustomWidgetConditionalStyle" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CustomExpression">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
@@ -305,4 +321,37 @@
   <eClassifiers xsi:type="ecore:EClass" name="RadioWidgetStyle" eSuperTypes="#//WidgetStyle"/>
   <eClassifiers xsi:type="ecore:EClass" name="ButtonWidgetStyle" eSuperTypes="#//WidgetStyle"/>
   <eClassifiers xsi:type="ecore:EClass" name="SelectWidgetStyle" eSuperTypes="#//WidgetStyle"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CustomWidgetStyle" eSuperTypes="#//WidgetStyle"/>
+  <eClassifiers xsi:type="ecore:EClass" name="WidgetConditionalStyle" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="preconditionExpression"
+        eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="TextWidgetConditionalStyle" eSuperTypes="#//WidgetConditionalStyle">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//TextWidgetStyle"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="LabelWidgetConditionalStyle" eSuperTypes="#//WidgetConditionalStyle">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//LabelWidgetStyle"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CheckboxWidgetConditionalStyle" eSuperTypes="#//WidgetConditionalStyle">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//CheckboxWidgetStyle"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RadioWidgetConditionalStyle" eSuperTypes="#//WidgetConditionalStyle">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//RadioWidgetStyle"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ButtonWidgetConditionalStyle" eSuperTypes="#//WidgetConditionalStyle">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//ButtonWidgetStyle"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SelectWidgetConditionalStyle" eSuperTypes="#//WidgetConditionalStyle">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//SelectWidgetStyle"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CustomWidgetConditionalStyle" eSuperTypes="#//WidgetConditionalStyle">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//CustomWidgetStyle"
+        containment="true"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/incubation/org.eclipse.sirius.properties/model/properties.genmodel b/incubation/org.eclipse.sirius.properties/model/properties.genmodel
index 619ca87398..e23ccd3c43 100644
--- a/incubation/org.eclipse.sirius.properties/model/properties.genmodel
+++ b/incubation/org.eclipse.sirius.properties/model/properties.genmodel
@@ -61,20 +61,24 @@
       <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"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//TextDescription/conditionalStyles"/>
     </genClasses>
     <genClasses ecoreClass="properties.ecore#//ButtonDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//ButtonDescription/buttonLabelExpression"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//ButtonDescription/initialOperation"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//ButtonDescription/style"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//ButtonDescription/conditionalStyles"/>
     </genClasses>
     <genClasses ecoreClass="properties.ecore#//LabelDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//LabelDescription/bodyExpression"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//LabelDescription/style"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//LabelDescription/conditionalStyles"/>
     </genClasses>
     <genClasses ecoreClass="properties.ecore#//CheckboxDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//CheckboxDescription/valueExpression"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CheckboxDescription/initialOperation"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CheckboxDescription/style"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CheckboxDescription/conditionalStyles"/>
     </genClasses>
     <genClasses ecoreClass="properties.ecore#//SelectDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/valueExpression"/>
@@ -82,6 +86,7 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/candidatesExpression"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/candidateDisplayExpression"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//SelectDescription/style"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//SelectDescription/conditionalStyles"/>
     </genClasses>
     <genClasses ecoreClass="properties.ecore#//DynamicMappingFor">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//DynamicMappingFor/iterator"/>
@@ -102,6 +107,7 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//RadioDescription/candidateDisplayExpression"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//RadioDescription/style"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//RadioDescription/numberOfColumns"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//RadioDescription/conditionalStyles"/>
     </genClasses>
     <genClasses ecoreClass="properties.ecore#//SingleReferenceDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SingleReferenceDescription/valueExpression"/>
@@ -127,6 +133,8 @@
     <genClasses ecoreClass="properties.ecore#//CustomDescription">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CustomDescription/customExpressions"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CustomDescription/customOperations"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CustomDescription/style"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CustomDescription/conditionalStyles"/>
     </genClasses>
     <genClasses ecoreClass="properties.ecore#//CustomExpression">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//CustomExpression/identifier"/>
@@ -161,5 +169,30 @@
     <genClasses ecoreClass="properties.ecore#//RadioWidgetStyle"/>
     <genClasses ecoreClass="properties.ecore#//ButtonWidgetStyle"/>
     <genClasses ecoreClass="properties.ecore#//SelectWidgetStyle"/>
+    <genClasses ecoreClass="properties.ecore#//CustomWidgetStyle"/>
+    <genClasses image="false" ecoreClass="properties.ecore#//WidgetConditionalStyle">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//WidgetConditionalStyle/preconditionExpression"/>
+    </genClasses>
+    <genClasses ecoreClass="properties.ecore#//TextWidgetConditionalStyle">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//TextWidgetConditionalStyle/style"/>
+    </genClasses>
+    <genClasses ecoreClass="properties.ecore#//LabelWidgetConditionalStyle">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//LabelWidgetConditionalStyle/style"/>
+    </genClasses>
+    <genClasses ecoreClass="properties.ecore#//CheckboxWidgetConditionalStyle">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CheckboxWidgetConditionalStyle/style"/>
+    </genClasses>
+    <genClasses ecoreClass="properties.ecore#//RadioWidgetConditionalStyle">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//RadioWidgetConditionalStyle/style"/>
+    </genClasses>
+    <genClasses ecoreClass="properties.ecore#//ButtonWidgetConditionalStyle">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//ButtonWidgetConditionalStyle/style"/>
+    </genClasses>
+    <genClasses ecoreClass="properties.ecore#//SelectWidgetConditionalStyle">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//SelectWidgetConditionalStyle/style"/>
+    </genClasses>
+    <genClasses ecoreClass="properties.ecore#//CustomWidgetConditionalStyle">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CustomWidgetConditionalStyle/style"/>
+    </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 dbbea393f6..30cfe69116 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
@@ -11,6 +11,7 @@
  */
 package org.eclipse.sirius.properties;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
@@ -29,6 +30,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em>Initial Operation</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.ButtonDescription#getStyle
  * <em>Style</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.ButtonDescription#getConditionalStyles
+ * <em>Conditional Styles</em>}</li>
  * </ul>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getButtonDescription()
@@ -130,4 +134,23 @@ public interface ButtonDescription extends WidgetDescription {
      */
     void setStyle(ButtonWidgetStyle value);
 
+    /**
+     * Returns the value of the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. The list contents are of type
+     * {@link org.eclipse.sirius.properties.ButtonWidgetConditionalStyle}. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Conditional Styles</em>' containment reference
+     * list isn't clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Conditional Styles</em>' containment
+     *         reference list.
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getButtonDescription_ConditionalStyles()
+     * @model containment="true"
+     * @generated
+     */
+    EList<ButtonWidgetConditionalStyle> getConditionalStyles();
+
 } // ButtonDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonWidgetConditionalStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonWidgetConditionalStyle.java
new file mode 100644
index 0000000000..1cfb24014b
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonWidgetConditionalStyle.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Button Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.ButtonWidgetConditionalStyle#getStyle
+ * <em>Style</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getButtonWidgetConditionalStyle()
+ * @model
+ * @generated
+ */
+public interface ButtonWidgetConditionalStyle extends WidgetConditionalStyle {
+    /**
+     * Returns the value of the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Style</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Style</em>' containment reference.
+     * @see #setStyle(ButtonWidgetStyle)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getButtonWidgetConditionalStyle_Style()
+     * @model containment="true"
+     * @generated
+     */
+    ButtonWidgetStyle getStyle();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.ButtonWidgetConditionalStyle#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(ButtonWidgetStyle value);
+
+} // ButtonWidgetConditionalStyle
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 63d9c0549f..8dff2347ca 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
@@ -11,6 +11,7 @@
  */
 package org.eclipse.sirius.properties;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
@@ -29,6 +30,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em>Initial Operation</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.CheckboxDescription#getStyle
  * <em>Style</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.CheckboxDescription#getConditionalStyles
+ * <em>Conditional Styles</em>}</li>
  * </ul>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getCheckboxDescription()
@@ -129,4 +133,23 @@ public interface CheckboxDescription extends WidgetDescription {
      */
     void setStyle(CheckboxWidgetStyle value);
 
+    /**
+     * Returns the value of the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. The list contents are of type
+     * {@link org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Conditional Styles</em>' containment reference
+     * list isn't clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Conditional Styles</em>' containment
+     *         reference list.
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getCheckboxDescription_ConditionalStyles()
+     * @model containment="true"
+     * @generated
+     */
+    EList<CheckboxWidgetConditionalStyle> getConditionalStyles();
+
 } // CheckboxDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxWidgetConditionalStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxWidgetConditionalStyle.java
new file mode 100644
index 0000000000..f222aae3a9
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxWidgetConditionalStyle.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Checkbox Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle#getStyle
+ * <em>Style</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getCheckboxWidgetConditionalStyle()
+ * @model
+ * @generated
+ */
+public interface CheckboxWidgetConditionalStyle extends WidgetConditionalStyle {
+    /**
+     * Returns the value of the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Style</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Style</em>' containment reference.
+     * @see #setStyle(CheckboxWidgetStyle)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getCheckboxWidgetConditionalStyle_Style()
+     * @model containment="true"
+     * @generated
+     */
+    CheckboxWidgetStyle getStyle();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle#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(CheckboxWidgetStyle value);
+
+} // CheckboxWidgetConditionalStyle
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomDescription.java
index 0a98b13d5e..10f5521e14 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomDescription.java
@@ -27,6 +27,11 @@ import org.eclipse.emf.common.util.EList;
  * <li>
  * {@link org.eclipse.sirius.properties.CustomDescription#getCustomOperations
  * <em>Custom Operations</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.CustomDescription#getStyle
+ * <em>Style</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.CustomDescription#getConditionalStyles
+ * <em>Conditional Styles</em>}</li>
  * </ul>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getCustomDescription()
@@ -72,4 +77,53 @@ public interface CustomDescription extends WidgetDescription {
      */
     EList<CustomOperation> getCustomOperations();
 
+    /**
+     * 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(CustomWidgetStyle)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getCustomDescription_Style()
+     * @model containment="true"
+     * @generated
+     */
+    CustomWidgetStyle getStyle();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.CustomDescription#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(CustomWidgetStyle value);
+
+    /**
+     * Returns the value of the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. The list contents are of type
+     * {@link org.eclipse.sirius.properties.CustomWidgetConditionalStyle}. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Conditional Styles</em>' containment reference
+     * list isn't clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Conditional Styles</em>' containment
+     *         reference list.
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getCustomDescription_ConditionalStyles()
+     * @model containment="true"
+     * @generated
+     */
+    EList<CustomWidgetConditionalStyle> getConditionalStyles();
+
 } // CustomDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomWidgetConditionalStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomWidgetConditionalStyle.java
new file mode 100644
index 0000000000..feb71a6ff3
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomWidgetConditionalStyle.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Custom Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.CustomWidgetConditionalStyle#getStyle
+ * <em>Style</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getCustomWidgetConditionalStyle()
+ * @model
+ * @generated
+ */
+public interface CustomWidgetConditionalStyle extends WidgetConditionalStyle {
+    /**
+     * Returns the value of the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Style</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Style</em>' containment reference.
+     * @see #setStyle(CustomWidgetStyle)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getCustomWidgetConditionalStyle_Style()
+     * @model containment="true"
+     * @generated
+     */
+    CustomWidgetStyle getStyle();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.CustomWidgetConditionalStyle#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(CustomWidgetStyle value);
+
+} // CustomWidgetConditionalStyle
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomWidgetStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomWidgetStyle.java
new file mode 100644
index 0000000000..9834c653fe
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CustomWidgetStyle.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Custom Widget Style</b></em>'. <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getCustomWidgetStyle()
+ * @model
+ * @generated
+ */
+public interface CustomWidgetStyle extends WidgetStyle {
+} // CustomWidgetStyle
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 59968fa715..cf44a651b7 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
@@ -11,6 +11,8 @@
  */
 package org.eclipse.sirius.properties;
 
+import org.eclipse.emf.common.util.EList;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Label Description</b></em>'. <!-- end-user-doc -->
@@ -23,6 +25,9 @@ package org.eclipse.sirius.properties;
  * <em>Body Expression</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.LabelDescription#getStyle
  * <em>Style</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.LabelDescription#getConditionalStyles
+ * <em>Conditional Styles</em>}</li>
  * </ul>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getLabelDescription()
@@ -91,4 +96,23 @@ public interface LabelDescription extends WidgetDescription {
      */
     void setStyle(LabelWidgetStyle value);
 
+    /**
+     * Returns the value of the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. The list contents are of type
+     * {@link org.eclipse.sirius.properties.LabelWidgetConditionalStyle}. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Conditional Styles</em>' containment reference
+     * list isn't clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Conditional Styles</em>' containment
+     *         reference list.
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getLabelDescription_ConditionalStyles()
+     * @model containment="true"
+     * @generated
+     */
+    EList<LabelWidgetConditionalStyle> getConditionalStyles();
+
 } // LabelDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelWidgetConditionalStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelWidgetConditionalStyle.java
new file mode 100644
index 0000000000..92ffb41e8f
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelWidgetConditionalStyle.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Label Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.sirius.properties.LabelWidgetConditionalStyle#getStyle
+ * <em>Style</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getLabelWidgetConditionalStyle()
+ * @model
+ * @generated
+ */
+public interface LabelWidgetConditionalStyle extends WidgetConditionalStyle {
+    /**
+     * Returns the value of the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Style</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Style</em>' containment reference.
+     * @see #setStyle(LabelWidgetStyle)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getLabelWidgetConditionalStyle_Style()
+     * @model containment="true"
+     * @generated
+     */
+    LabelWidgetStyle getStyle();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.LabelWidgetConditionalStyle#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(LabelWidgetStyle value);
+
+} // LabelWidgetConditionalStyle
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 58393d91a2..105c3002e9 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
@@ -292,6 +292,79 @@ public interface PropertiesFactory extends EFactory {
     SelectWidgetStyle createSelectWidgetStyle();
 
     /**
+     * Returns a new object of class '<em>Custom Widget Style</em>'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Custom Widget Style</em>'.
+     * @generated
+     */
+    CustomWidgetStyle createCustomWidgetStyle();
+
+    /**
+     * Returns a new object of class '<em>Text Widget Conditional Style</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Text Widget Conditional Style</em>'.
+     * @generated
+     */
+    TextWidgetConditionalStyle createTextWidgetConditionalStyle();
+
+    /**
+     * Returns a new object of class '<em>Label Widget Conditional Style</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Label Widget Conditional Style</em>'.
+     * @generated
+     */
+    LabelWidgetConditionalStyle createLabelWidgetConditionalStyle();
+
+    /**
+     * Returns a new object of class '<em>Checkbox Widget Conditional Style</em>
+     * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Checkbox Widget Conditional Style</em>
+     *         '.
+     * @generated
+     */
+    CheckboxWidgetConditionalStyle createCheckboxWidgetConditionalStyle();
+
+    /**
+     * Returns a new object of class '<em>Radio Widget Conditional Style</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Radio Widget Conditional Style</em>'.
+     * @generated
+     */
+    RadioWidgetConditionalStyle createRadioWidgetConditionalStyle();
+
+    /**
+     * Returns a new object of class '<em>Button Widget Conditional Style</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Button Widget Conditional Style</em>'.
+     * @generated
+     */
+    ButtonWidgetConditionalStyle createButtonWidgetConditionalStyle();
+
+    /**
+     * Returns a new object of class '<em>Select Widget Conditional Style</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Select Widget Conditional Style</em>'.
+     * @generated
+     */
+    SelectWidgetConditionalStyle createSelectWidgetConditionalStyle();
+
+    /**
+     * Returns a new object of class '<em>Custom Widget Conditional Style</em>'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Custom Widget Conditional Style</em>'.
+     * @generated
+     */
+    CustomWidgetConditionalStyle createCustomWidgetConditionalStyle();
+
+    /**
      * Returns the package supported by this factory. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      *
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 82fd99b984..de7e73a5a4 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
@@ -608,13 +608,22 @@ public interface PropertiesPackage extends EPackage {
     int TEXT_DESCRIPTION__STYLE = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
 
     /**
+     * The feature id for the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
+
+    /**
      * 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 + 3;
+    int TEXT_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
 
     /**
      * The meta object id for the '
@@ -683,13 +692,22 @@ public interface PropertiesPackage extends EPackage {
     int BUTTON_DESCRIPTION__STYLE = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
 
     /**
+     * The feature id for the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BUTTON_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
+
+    /**
      * The number of structural features of the '<em>Button Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int BUTTON_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
+    int BUTTON_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
 
     /**
      * The meta object id for the '
@@ -749,13 +767,22 @@ public interface PropertiesPackage extends EPackage {
     int LABEL_DESCRIPTION__STYLE = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
 
     /**
+     * The feature id for the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+
+    /**
      * The number of structural features of the '<em>Label Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int LABEL_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+    int LABEL_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
 
     /**
      * The meta object id for the '
@@ -824,13 +851,22 @@ public interface PropertiesPackage extends EPackage {
     int CHECKBOX_DESCRIPTION__STYLE = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
 
     /**
+     * The feature id for the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
+
+    /**
      * The number of structural features of the '<em>Checkbox Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int CHECKBOX_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
+    int CHECKBOX_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
 
     /**
      * The meta object id for the '
@@ -917,13 +953,22 @@ public interface PropertiesPackage extends EPackage {
     int SELECT_DESCRIPTION__STYLE = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
 
     /**
+     * The feature id for the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SELECT_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 5;
+
+    /**
      * The number of structural features of the '<em>Select Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int SELECT_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 5;
+    int SELECT_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 6;
 
     /**
      * The meta object id for the '
@@ -1079,6 +1124,15 @@ public interface PropertiesPackage extends EPackage {
     int TEXT_AREA_DESCRIPTION__STYLE = PropertiesPackage.TEXT_DESCRIPTION__STYLE;
 
     /**
+     * The feature id for the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_AREA_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.TEXT_DESCRIPTION__CONDITIONAL_STYLES;
+
+    /**
      * The feature id for the '<em><b>Line Count</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -1190,13 +1244,22 @@ public interface PropertiesPackage extends EPackage {
     int RADIO_DESCRIPTION__NUMBER_OF_COLUMNS = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 5;
 
     /**
+     * The feature id for the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RADIO_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 6;
+
+    /**
      * The number of structural features of the '<em>Radio Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int RADIO_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 6;
+    int RADIO_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 7;
 
     /**
      * The meta object id for the '
@@ -1333,42 +1396,6 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The meta object id for the '
-     * {@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
-     */
-    int CUSTOM_DESCRIPTION = 20;
-
-    /**
-     * The meta object id for the '
-     * {@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
-     */
-    int CUSTOM_EXPRESSION = 21;
-
-    /**
-     * The meta object id for the '
-     * {@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
-     */
-    int CUSTOM_OPERATION = 22;
-
-    /**
-     * The meta object id for the '
      * {@link org.eclipse.sirius.properties.impl.MultipleReferencesDescriptionImpl
      * <em>Multiple References Description</em>}' class. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -1489,6 +1516,18 @@ public interface PropertiesPackage extends EPackage {
     int MULTIPLE_REFERENCES_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 8;
 
     /**
+     * The meta object id for the '
+     * {@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
+     */
+    int CUSTOM_DESCRIPTION = 20;
+
+    /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -1534,13 +1573,43 @@ public interface PropertiesPackage extends EPackage {
     int CUSTOM_DESCRIPTION__CUSTOM_OPERATIONS = 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 CUSTOM_DESCRIPTION__STYLE = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+
+    /**
+     * The feature id for the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CUSTOM_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
+
+    /**
      * The number of structural features of the '<em>Custom Description</em>'
      * class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int CUSTOM_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+    int CUSTOM_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
+
+    /**
+     * The meta object id for the '
+     * {@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
+     */
+    int CUSTOM_EXPRESSION = 21;
 
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
@@ -1570,6 +1639,18 @@ public interface PropertiesPackage extends EPackage {
     int CUSTOM_EXPRESSION_FEATURE_COUNT = 2;
 
     /**
+     * The meta object id for the '
+     * {@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
+     */
+    int CUSTOM_OPERATION = 22;
+
+    /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
@@ -2149,6 +2230,383 @@ public interface PropertiesPackage extends EPackage {
     int SELECT_WIDGET_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 0;
 
     /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.CustomWidgetStyleImpl
+     * <em>Custom Widget Style</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.CustomWidgetStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomWidgetStyle()
+     * @generated
+     */
+    int CUSTOM_WIDGET_STYLE = 30;
+
+    /**
+     * The feature id for the '<em><b>Label Font Name Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CUSTOM_WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_NAME_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Label Font Size</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CUSTOM_WIDGET_STYLE__LABEL_FONT_SIZE = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_SIZE;
+
+    /**
+     * The feature id for the '<em><b>Label Background Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CUSTOM_WIDGET_STYLE__LABEL_BACKGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_BACKGROUND_COLOR;
+
+    /**
+     * The feature id for the '<em><b>Label Foreground Color</b></em>'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CUSTOM_WIDGET_STYLE__LABEL_FOREGROUND_COLOR = PropertiesPackage.WIDGET_STYLE__LABEL_FOREGROUND_COLOR;
+
+    /**
+     * The feature id for the '<em><b>Label Font Format</b></em>' attribute
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CUSTOM_WIDGET_STYLE__LABEL_FONT_FORMAT = PropertiesPackage.WIDGET_STYLE__LABEL_FONT_FORMAT;
+
+    /**
+     * The number of structural features of the '<em>Custom Widget Style</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CUSTOM_WIDGET_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_STYLE_FEATURE_COUNT + 0;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.WidgetConditionalStyleImpl
+     * <em>Widget Conditional Style</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.WidgetConditionalStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getWidgetConditionalStyle()
+     * @generated
+     */
+    int WIDGET_CONDITIONAL_STYLE = 31;
+
+    /**
+     * The feature id for the '<em><b>Precondition Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION = 0;
+
+    /**
+     * The number of structural features of the '
+     * <em>Widget Conditional Style</em>' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT = 1;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.TextWidgetConditionalStyleImpl
+     * <em>Text Widget Conditional Style</em>}' class. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.TextWidgetConditionalStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextWidgetConditionalStyle()
+     * @generated
+     */
+    int TEXT_WIDGET_CONDITIONAL_STYLE = 32;
+
+    /**
+     * The feature id for the '<em><b>Precondition Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION = PropertiesPackage.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '
+     * <em>Text Widget Conditional Style</em>' class. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int TEXT_WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 1;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.LabelWidgetConditionalStyleImpl
+     * <em>Label Widget Conditional Style</em>}' class. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.LabelWidgetConditionalStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getLabelWidgetConditionalStyle()
+     * @generated
+     */
+    int LABEL_WIDGET_CONDITIONAL_STYLE = 33;
+
+    /**
+     * The feature id for the '<em><b>Precondition Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION = PropertiesPackage.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '
+     * <em>Label Widget Conditional Style</em>' class. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int LABEL_WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 1;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.CheckboxWidgetConditionalStyleImpl
+     * <em>Checkbox Widget Conditional Style</em>}' class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.CheckboxWidgetConditionalStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCheckboxWidgetConditionalStyle()
+     * @generated
+     */
+    int CHECKBOX_WIDGET_CONDITIONAL_STYLE = 34;
+
+    /**
+     * The feature id for the '<em><b>Precondition Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CHECKBOX_WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION = PropertiesPackage.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '
+     * <em>Checkbox Widget Conditional Style</em>' class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CHECKBOX_WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 1;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.RadioWidgetConditionalStyleImpl
+     * <em>Radio Widget Conditional Style</em>}' class. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.RadioWidgetConditionalStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getRadioWidgetConditionalStyle()
+     * @generated
+     */
+    int RADIO_WIDGET_CONDITIONAL_STYLE = 35;
+
+    /**
+     * The feature id for the '<em><b>Precondition Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RADIO_WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION = PropertiesPackage.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RADIO_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '
+     * <em>Radio Widget Conditional Style</em>' class. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RADIO_WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 1;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.ButtonWidgetConditionalStyleImpl
+     * <em>Button Widget Conditional Style</em>}' class. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.ButtonWidgetConditionalStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getButtonWidgetConditionalStyle()
+     * @generated
+     */
+    int BUTTON_WIDGET_CONDITIONAL_STYLE = 36;
+
+    /**
+     * The feature id for the '<em><b>Precondition Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BUTTON_WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION = PropertiesPackage.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '
+     * <em>Button Widget Conditional Style</em>' class. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int BUTTON_WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 1;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.SelectWidgetConditionalStyleImpl
+     * <em>Select Widget Conditional Style</em>}' class. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.SelectWidgetConditionalStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSelectWidgetConditionalStyle()
+     * @generated
+     */
+    int SELECT_WIDGET_CONDITIONAL_STYLE = 37;
+
+    /**
+     * The feature id for the '<em><b>Precondition Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SELECT_WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION = PropertiesPackage.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SELECT_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '
+     * <em>Select Widget Conditional Style</em>' class. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int SELECT_WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 1;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.CustomWidgetConditionalStyleImpl
+     * <em>Custom Widget Conditional Style</em>}' class. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @see org.eclipse.sirius.properties.impl.CustomWidgetConditionalStyleImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomWidgetConditionalStyle()
+     * @generated
+     */
+    int CUSTOM_WIDGET_CONDITIONAL_STYLE = 38;
+
+    /**
+     * The feature id for the '<em><b>Precondition Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CUSTOM_WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION = PropertiesPackage.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 0;
+
+    /**
+     * The number of structural features of the '
+     * <em>Custom Widget Conditional Style</em>' class. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int CUSTOM_WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT = PropertiesPackage.WIDGET_CONDITIONAL_STYLE_FEATURE_COUNT + 1;
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.ViewExtensionDescription
      * <em>View Extension Description</em>}'. <!-- begin-user-doc --> <!--
@@ -2659,6 +3117,20 @@ public interface PropertiesPackage extends EPackage {
     EReference getTextDescription_Style();
 
     /**
+     * Returns the meta object for the containment reference list '
+     * {@link org.eclipse.sirius.properties.TextDescription#getConditionalStyles
+     * <em>Conditional Styles</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the containment reference list '
+     *         <em>Conditional Styles</em>'.
+     * @see org.eclipse.sirius.properties.TextDescription#getConditionalStyles()
+     * @see #getTextDescription()
+     * @generated
+     */
+    EReference getTextDescription_ConditionalStyles();
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.ButtonDescription
      * <em>Button Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -2711,6 +3183,20 @@ public interface PropertiesPackage extends EPackage {
     EReference getButtonDescription_Style();
 
     /**
+     * Returns the meta object for the containment reference list '
+     * {@link org.eclipse.sirius.properties.ButtonDescription#getConditionalStyles
+     * <em>Conditional Styles</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the containment reference list '
+     *         <em>Conditional Styles</em>'.
+     * @see org.eclipse.sirius.properties.ButtonDescription#getConditionalStyles()
+     * @see #getButtonDescription()
+     * @generated
+     */
+    EReference getButtonDescription_ConditionalStyles();
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.LabelDescription
      * <em>Label Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -2747,6 +3233,20 @@ public interface PropertiesPackage extends EPackage {
     EReference getLabelDescription_Style();
 
     /**
+     * Returns the meta object for the containment reference list '
+     * {@link org.eclipse.sirius.properties.LabelDescription#getConditionalStyles
+     * <em>Conditional Styles</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the containment reference list '
+     *         <em>Conditional Styles</em>'.
+     * @see org.eclipse.sirius.properties.LabelDescription#getConditionalStyles()
+     * @see #getLabelDescription()
+     * @generated
+     */
+    EReference getLabelDescription_ConditionalStyles();
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.CheckboxDescription
      * <em>Checkbox Description</em>}'. <!-- begin-user-doc --> <!--
@@ -2798,6 +3298,20 @@ public interface PropertiesPackage extends EPackage {
     EReference getCheckboxDescription_Style();
 
     /**
+     * Returns the meta object for the containment reference list '
+     * {@link org.eclipse.sirius.properties.CheckboxDescription#getConditionalStyles
+     * <em>Conditional Styles</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the containment reference list '
+     *         <em>Conditional Styles</em>'.
+     * @see org.eclipse.sirius.properties.CheckboxDescription#getConditionalStyles()
+     * @see #getCheckboxDescription()
+     * @generated
+     */
+    EReference getCheckboxDescription_ConditionalStyles();
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.SelectDescription
      * <em>Select Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -2877,6 +3391,20 @@ public interface PropertiesPackage extends EPackage {
     EReference getSelectDescription_Style();
 
     /**
+     * Returns the meta object for the containment reference list '
+     * {@link org.eclipse.sirius.properties.SelectDescription#getConditionalStyles
+     * <em>Conditional Styles</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the containment reference list '
+     *         <em>Conditional Styles</em>'.
+     * @see org.eclipse.sirius.properties.SelectDescription#getConditionalStyles()
+     * @see #getSelectDescription()
+     * @generated
+     */
+    EReference getSelectDescription_ConditionalStyles();
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.DynamicMappingFor
      * <em>Dynamic Mapping For</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -3082,6 +3610,20 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getRadioDescription_NumberOfColumns();
 
     /**
+     * Returns the meta object for the containment reference list '
+     * {@link org.eclipse.sirius.properties.RadioDescription#getConditionalStyles
+     * <em>Conditional Styles</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the containment reference list '
+     *         <em>Conditional Styles</em>'.
+     * @see org.eclipse.sirius.properties.RadioDescription#getConditionalStyles()
+     * @see #getRadioDescription()
+     * @generated
+     */
+    EReference getRadioDescription_ConditionalStyles();
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.SingleReferenceDescription
      * <em>Single Reference Description</em>}'. <!-- begin-user-doc --> <!--
@@ -3188,6 +3730,140 @@ public interface PropertiesPackage extends EPackage {
     EClass getOperationDescription();
 
     /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.OperationDescription#getInitialOperation
+     * <em>Initial Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the containment reference '
+     *         <em>Initial Operation</em>'.
+     * @see org.eclipse.sirius.properties.OperationDescription#getInitialOperation()
+     * @see #getOperationDescription()
+     * @generated
+     */
+    EReference getOperationDescription_InitialOperation();
+
+    /**
+     * Returns the meta object for class '
+     * {@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
+     * @generated
+     */
+    EClass getMultipleReferencesDescription();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getValueExpression
+     * <em>Value Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the attribute '<em>Value Expression</em>'.
+     * @see org.eclipse.sirius.properties.MultipleReferencesDescription#getValueExpression()
+     * @see #getMultipleReferencesDescription()
+     * @generated
+     */
+    EAttribute getMultipleReferencesDescription_ValueExpression();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getDisplayExpression
+     * <em>Display Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the attribute '<em>Display Expression</em>'.
+     * @see org.eclipse.sirius.properties.MultipleReferencesDescription#getDisplayExpression()
+     * @see #getMultipleReferencesDescription()
+     * @generated
+     */
+    EAttribute getMultipleReferencesDescription_DisplayExpression();
+
+    /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getCreateOperation
+     * <em>Create Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the containment reference '
+     *         <em>Create Operation</em>'.
+     * @see org.eclipse.sirius.properties.MultipleReferencesDescription#getCreateOperation()
+     * @see #getMultipleReferencesDescription()
+     * @generated
+     */
+    EReference getMultipleReferencesDescription_CreateOperation();
+
+    /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getSearchOperation
+     * <em>Search Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the containment reference '
+     *         <em>Search Operation</em>'.
+     * @see org.eclipse.sirius.properties.MultipleReferencesDescription#getSearchOperation()
+     * @see #getMultipleReferencesDescription()
+     * @generated
+     */
+    EReference getMultipleReferencesDescription_SearchOperation();
+
+    /**
+     * 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()
+     * @see #getMultipleReferencesDescription()
+     * @generated
+     */
+    EReference getMultipleReferencesDescription_UnsetOperation();
+
+    /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getOnClickOperation
+     * <em>On Click Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the containment reference '
+     *         <em>On Click Operation</em>'.
+     * @see org.eclipse.sirius.properties.MultipleReferencesDescription#getOnClickOperation()
+     * @see #getMultipleReferencesDescription()
+     * @generated
+     */
+    EReference getMultipleReferencesDescription_OnClickOperation();
+
+    /**
+     * 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()
+     * @see #getMultipleReferencesDescription()
+     * @generated
+     */
+    EReference getMultipleReferencesDescription_UpOperation();
+
+    /**
+     * 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()
+     * @see #getMultipleReferencesDescription()
+     * @generated
+     */
+    EReference getMultipleReferencesDescription_DownOperation();
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.CustomDescription
      * <em>Custom Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -3228,6 +3904,32 @@ public interface PropertiesPackage extends EPackage {
     EReference getCustomDescription_CustomOperations();
 
     /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.CustomDescription#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.CustomDescription#getStyle()
+     * @see #getCustomDescription()
+     * @generated
+     */
+    EReference getCustomDescription_Style();
+
+    /**
+     * Returns the meta object for the containment reference list '
+     * {@link org.eclipse.sirius.properties.CustomDescription#getConditionalStyles
+     * <em>Conditional Styles</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the containment reference list '
+     *         <em>Conditional Styles</em>'.
+     * @see org.eclipse.sirius.properties.CustomDescription#getConditionalStyles()
+     * @see #getCustomDescription()
+     * @generated
+     */
+    EReference getCustomDescription_ConditionalStyles();
+
+    /**
      * Returns the meta object for class '
      * {@link org.eclipse.sirius.properties.CustomExpression
      * <em>Custom Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -3582,129 +4284,217 @@ public interface PropertiesPackage extends EPackage {
     EClass getSelectWidgetStyle();
 
     /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.CustomWidgetStyle
+     * <em>Custom Widget Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for class '<em>Custom Widget Style</em>'.
+     * @see org.eclipse.sirius.properties.CustomWidgetStyle
      * @generated
      */
-    EReference getOperationDescription_InitialOperation();
+    EClass getCustomWidgetStyle();
 
     /**
      * Returns the meta object for class '
-     * {@link org.eclipse.sirius.properties.MultipleReferencesDescription
-     * <em>Multiple References Description</em>}'. <!-- begin-user-doc --> <!--
+     * {@link org.eclipse.sirius.properties.WidgetConditionalStyle
+     * <em>Widget Conditional Style</em>}'. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      *
-     * @return the meta object for class '
-     *         <em>Multiple References Description</em>'.
-     * @see org.eclipse.sirius.properties.MultipleReferencesDescription
+     * @return the meta object for class '<em>Widget Conditional Style</em>'.
+     * @see org.eclipse.sirius.properties.WidgetConditionalStyle
      * @generated
      */
-    EClass getMultipleReferencesDescription();
+    EClass getWidgetConditionalStyle();
 
     /**
      * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getValueExpression
-     * <em>Value Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
+     * {@link org.eclipse.sirius.properties.WidgetConditionalStyle#getPreconditionExpression
+     * <em>Precondition Expression</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
      *
-     * @return the meta object for the attribute '<em>Value Expression</em>'.
-     * @see org.eclipse.sirius.properties.MultipleReferencesDescription#getValueExpression()
-     * @see #getMultipleReferencesDescription()
+     * @return the meta object for the attribute '
+     *         <em>Precondition Expression</em>'.
+     * @see org.eclipse.sirius.properties.WidgetConditionalStyle#getPreconditionExpression()
+     * @see #getWidgetConditionalStyle()
      * @generated
      */
-    EAttribute getMultipleReferencesDescription_ValueExpression();
+    EAttribute getWidgetConditionalStyle_PreconditionExpression();
 
     /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getDisplayExpression
-     * <em>Display Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.TextWidgetConditionalStyle
+     * <em>Text Widget Conditional Style</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
      *
-     * @return the meta object for the attribute '<em>Display Expression</em>'.
-     * @see org.eclipse.sirius.properties.MultipleReferencesDescription#getDisplayExpression()
-     * @see #getMultipleReferencesDescription()
+     * @return the meta object for class '<em>Text Widget Conditional Style</em>
+     *         '.
+     * @see org.eclipse.sirius.properties.TextWidgetConditionalStyle
      * @generated
      */
-    EAttribute getMultipleReferencesDescription_DisplayExpression();
+    EClass getTextWidgetConditionalStyle();
 
     /**
      * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getCreateOperation
-     * <em>Create Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
+     * {@link org.eclipse.sirius.properties.TextWidgetConditionalStyle#getStyle
+     * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
-     * @return the meta object for the containment reference '
-     *         <em>Create Operation</em>'.
-     * @see org.eclipse.sirius.properties.MultipleReferencesDescription#getCreateOperation()
-     * @see #getMultipleReferencesDescription()
+     * @return the meta object for the containment reference '<em>Style</em>'.
+     * @see org.eclipse.sirius.properties.TextWidgetConditionalStyle#getStyle()
+     * @see #getTextWidgetConditionalStyle()
      * @generated
      */
-    EReference getMultipleReferencesDescription_CreateOperation();
+    EReference getTextWidgetConditionalStyle_Style();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.LabelWidgetConditionalStyle
+     * <em>Label Widget Conditional Style</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @return the meta object for class '
+     *         <em>Label Widget Conditional Style</em>'.
+     * @see org.eclipse.sirius.properties.LabelWidgetConditionalStyle
+     * @generated
+     */
+    EClass getLabelWidgetConditionalStyle();
 
     /**
      * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getSearchOperation
-     * <em>Search Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
+     * {@link org.eclipse.sirius.properties.LabelWidgetConditionalStyle#getStyle
+     * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
-     * @return the meta object for the containment reference '
-     *         <em>Search Operation</em>'.
-     * @see org.eclipse.sirius.properties.MultipleReferencesDescription#getSearchOperation()
-     * @see #getMultipleReferencesDescription()
+     * @return the meta object for the containment reference '<em>Style</em>'.
+     * @see org.eclipse.sirius.properties.LabelWidgetConditionalStyle#getStyle()
+     * @see #getLabelWidgetConditionalStyle()
      * @generated
      */
-    EReference getMultipleReferencesDescription_SearchOperation();
+    EReference getLabelWidgetConditionalStyle_Style();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle
+     * <em>Checkbox Widget Conditional Style</em>}'. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @return the meta object for class '
+     *         <em>Checkbox Widget Conditional Style</em>'.
+     * @see org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle
+     * @generated
+     */
+    EClass getCheckboxWidgetConditionalStyle();
 
     /**
      * 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 -->
+     * {@link org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle#getStyle
+     * <em>Style</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()
-     * @see #getMultipleReferencesDescription()
+     * @return the meta object for the containment reference '<em>Style</em>'.
+     * @see org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle#getStyle()
+     * @see #getCheckboxWidgetConditionalStyle()
      * @generated
      */
-    EReference getMultipleReferencesDescription_UnsetOperation();
+    EReference getCheckboxWidgetConditionalStyle_Style();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.RadioWidgetConditionalStyle
+     * <em>Radio Widget Conditional Style</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @return the meta object for class '
+     *         <em>Radio Widget Conditional Style</em>'.
+     * @see org.eclipse.sirius.properties.RadioWidgetConditionalStyle
+     * @generated
+     */
+    EClass getRadioWidgetConditionalStyle();
 
     /**
      * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.properties.MultipleReferencesDescription#getOnClickOperation
-     * <em>On Click Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
+     * {@link org.eclipse.sirius.properties.RadioWidgetConditionalStyle#getStyle
+     * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
-     * @return the meta object for the containment reference '
-     *         <em>On Click Operation</em>'.
-     * @see org.eclipse.sirius.properties.MultipleReferencesDescription#getOnClickOperation()
-     * @see #getMultipleReferencesDescription()
+     * @return the meta object for the containment reference '<em>Style</em>'.
+     * @see org.eclipse.sirius.properties.RadioWidgetConditionalStyle#getStyle()
+     * @see #getRadioWidgetConditionalStyle()
      * @generated
      */
-    EReference getMultipleReferencesDescription_OnClickOperation();
+    EReference getRadioWidgetConditionalStyle_Style();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.ButtonWidgetConditionalStyle
+     * <em>Button Widget Conditional Style</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @return the meta object for class '
+     *         <em>Button Widget Conditional Style</em>'.
+     * @see org.eclipse.sirius.properties.ButtonWidgetConditionalStyle
+     * @generated
+     */
+    EClass getButtonWidgetConditionalStyle();
 
     /**
      * 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 -->
+     * {@link org.eclipse.sirius.properties.ButtonWidgetConditionalStyle#getStyle
+     * <em>Style</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()
-     * @see #getMultipleReferencesDescription()
+     * @return the meta object for the containment reference '<em>Style</em>'.
+     * @see org.eclipse.sirius.properties.ButtonWidgetConditionalStyle#getStyle()
+     * @see #getButtonWidgetConditionalStyle()
      * @generated
      */
-    EReference getMultipleReferencesDescription_UpOperation();
+    EReference getButtonWidgetConditionalStyle_Style();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.SelectWidgetConditionalStyle
+     * <em>Select Widget Conditional Style</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @return the meta object for class '
+     *         <em>Select Widget Conditional Style</em>'.
+     * @see org.eclipse.sirius.properties.SelectWidgetConditionalStyle
+     * @generated
+     */
+    EClass getSelectWidgetConditionalStyle();
 
     /**
      * 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 -->
+     * {@link org.eclipse.sirius.properties.SelectWidgetConditionalStyle#getStyle
+     * <em>Style</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()
-     * @see #getMultipleReferencesDescription()
+     * @return the meta object for the containment reference '<em>Style</em>'.
+     * @see org.eclipse.sirius.properties.SelectWidgetConditionalStyle#getStyle()
+     * @see #getSelectWidgetConditionalStyle()
      * @generated
      */
-    EReference getMultipleReferencesDescription_DownOperation();
+    EReference getSelectWidgetConditionalStyle_Style();
+
+    /**
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.CustomWidgetConditionalStyle
+     * <em>Custom Widget Conditional Style</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @return the meta object for class '
+     *         <em>Custom Widget Conditional Style</em>'.
+     * @see org.eclipse.sirius.properties.CustomWidgetConditionalStyle
+     * @generated
+     */
+    EClass getCustomWidgetConditionalStyle();
+
+    /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.CustomWidgetConditionalStyle#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.CustomWidgetConditionalStyle#getStyle()
+     * @see #getCustomWidgetConditionalStyle()
+     * @generated
+     */
+    EReference getCustomWidgetConditionalStyle_Style();
 
     /**
      * Returns the factory that creates the instances of the model. <!--
@@ -4098,6 +4888,15 @@ public interface PropertiesPackage extends EPackage {
         EReference TEXT_DESCRIPTION__STYLE = PropertiesPackage.eINSTANCE.getTextDescription_Style();
 
         /**
+         * The meta object literal for the '<em><b>Conditional Styles</b></em>'
+         * containment reference list feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @generated
+         */
+        EReference TEXT_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.eINSTANCE.getTextDescription_ConditionalStyles();
+
+        /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.ButtonDescriptionImpl
          * <em>Button Description</em>}' class. <!-- begin-user-doc --> <!--
@@ -4136,6 +4935,15 @@ public interface PropertiesPackage extends EPackage {
         EReference BUTTON_DESCRIPTION__STYLE = PropertiesPackage.eINSTANCE.getButtonDescription_Style();
 
         /**
+         * The meta object literal for the '<em><b>Conditional Styles</b></em>'
+         * containment reference list feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @generated
+         */
+        EReference BUTTON_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.eINSTANCE.getButtonDescription_ConditionalStyles();
+
+        /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.LabelDescriptionImpl
          * <em>Label Description</em>}' class. <!-- begin-user-doc --> <!--
@@ -4164,6 +4972,15 @@ public interface PropertiesPackage extends EPackage {
         EReference LABEL_DESCRIPTION__STYLE = PropertiesPackage.eINSTANCE.getLabelDescription_Style();
 
         /**
+         * The meta object literal for the '<em><b>Conditional Styles</b></em>'
+         * containment reference list feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @generated
+         */
+        EReference LABEL_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.eINSTANCE.getLabelDescription_ConditionalStyles();
+
+        /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl
          * <em>Checkbox Description</em>}' class. <!-- begin-user-doc --> <!--
@@ -4201,6 +5018,15 @@ public interface PropertiesPackage extends EPackage {
         EReference CHECKBOX_DESCRIPTION__STYLE = PropertiesPackage.eINSTANCE.getCheckboxDescription_Style();
 
         /**
+         * The meta object literal for the '<em><b>Conditional Styles</b></em>'
+         * containment reference list feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @generated
+         */
+        EReference CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.eINSTANCE.getCheckboxDescription_ConditionalStyles();
+
+        /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl
          * <em>Select Description</em>}' class. <!-- begin-user-doc --> <!--
@@ -4256,6 +5082,15 @@ public interface PropertiesPackage extends EPackage {
         EReference SELECT_DESCRIPTION__STYLE = PropertiesPackage.eINSTANCE.getSelectDescription_Style();
 
         /**
+         * The meta object literal for the '<em><b>Conditional Styles</b></em>'
+         * containment reference list feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @generated
+         */
+        EReference SELECT_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.eINSTANCE.getSelectDescription_ConditionalStyles();
+
+        /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl
          * <em>Dynamic Mapping For</em>}' class. <!-- begin-user-doc --> <!--
@@ -4404,6 +5239,15 @@ public interface PropertiesPackage extends EPackage {
         EAttribute RADIO_DESCRIPTION__NUMBER_OF_COLUMNS = PropertiesPackage.eINSTANCE.getRadioDescription_NumberOfColumns();
 
         /**
+         * The meta object literal for the '<em><b>Conditional Styles</b></em>'
+         * containment reference list feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @generated
+         */
+        EReference RADIO_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.eINSTANCE.getRadioDescription_ConditionalStyles();
+
+        /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.SingleReferenceDescriptionImpl
          * <em>Single Reference Description</em>}' class. <!-- begin-user-doc
@@ -4432,6 +5276,145 @@ public interface PropertiesPackage extends EPackage {
         EAttribute SINGLE_REFERENCE_DESCRIPTION__DISPLAY_EXPRESSION = PropertiesPackage.eINSTANCE.getSingleReferenceDescription_DisplayExpression();
 
         /**
+         * The meta object literal for the '<em><b>Create Operation</b></em>'
+         * containment reference feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @generated
+         */
+        EReference SINGLE_REFERENCE_DESCRIPTION__CREATE_OPERATION = PropertiesPackage.eINSTANCE.getSingleReferenceDescription_CreateOperation();
+
+        /**
+         * 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();
+
+        /**
+         * 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();
+
+        /**
+         * 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();
+
+        /**
+         * The meta object literal for the '
+         * {@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
+         */
+        EClass OPERATION_DESCRIPTION = PropertiesPackage.eINSTANCE.getOperationDescription();
+
+        /**
+         * 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();
+
+        /**
+         * The meta object literal for the '
+         * {@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
+         */
+        EClass MULTIPLE_REFERENCES_DESCRIPTION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription();
+
+        /**
+         * 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();
+
+        /**
+         * 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();
+
+        /**
+         * 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();
+
+        /**
+         * 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();
+
+        /**
+         * 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();
+
+        /**
+         * 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();
+
+        /**
+         * 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();
+
+        /**
+         * 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();
+
+        /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.CustomDescriptionImpl
          * <em>Custom Description</em>}' class. <!-- begin-user-doc --> <!--
@@ -4462,6 +5445,23 @@ public interface PropertiesPackage extends EPackage {
         EReference CUSTOM_DESCRIPTION__CUSTOM_OPERATIONS = PropertiesPackage.eINSTANCE.getCustomDescription_CustomOperations();
 
         /**
+         * The meta object literal for the '<em><b>Style</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference CUSTOM_DESCRIPTION__STYLE = PropertiesPackage.eINSTANCE.getCustomDescription_Style();
+
+        /**
+         * The meta object literal for the '<em><b>Conditional Styles</b></em>'
+         * containment reference list feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         *
+         * @generated
+         */
+        EReference CUSTOM_DESCRIPTION__CONDITIONAL_STYLES = PropertiesPackage.eINSTANCE.getCustomDescription_ConditionalStyles();
+
+        /**
          * The meta object literal for the '
          * {@link org.eclipse.sirius.properties.impl.CustomExpressionImpl
          * <em>Custom Expression</em>}' class. <!-- begin-user-doc --> <!--
@@ -4726,141 +5726,177 @@ public interface PropertiesPackage extends EPackage {
         EClass SELECT_WIDGET_STYLE = PropertiesPackage.eINSTANCE.getSelectWidgetStyle();
 
         /**
-         * The meta object literal for the ' end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.CustomWidgetStyleImpl
+         * <em>Custom Widget Style</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
          *
+         * @see org.eclipse.sirius.properties.impl.CustomWidgetStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomWidgetStyle()
          * @generated
          */
-        EReference SINGLE_REFERENCE_DESCRIPTION__CREATE_OPERATION = PropertiesPackage.eINSTANCE.getSingleReferenceDescription_CreateOperation();
+        EClass CUSTOM_WIDGET_STYLE = PropertiesPackage.eINSTANCE.getCustomWidgetStyle();
 
         /**
-         * The meta object literal for the '<em><b>Search Operation</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.WidgetConditionalStyleImpl
+         * <em>Widget Conditional Style</em>}' class. <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          *
+         * @see org.eclipse.sirius.properties.impl.WidgetConditionalStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getWidgetConditionalStyle()
          * @generated
          */
-        EReference SINGLE_REFERENCE_DESCRIPTION__SEARCH_OPERATION = PropertiesPackage.eINSTANCE.getSingleReferenceDescription_SearchOperation();
+        EClass WIDGET_CONDITIONAL_STYLE = PropertiesPackage.eINSTANCE.getWidgetConditionalStyle();
 
         /**
-         * The meta object literal for the '<em><b>Unset Operation</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * The meta object literal for the '
+         * <em><b>Precondition Expression</b></em>' attribute feature. <!--
+         * begin-user-doc --> <!-- end-user-doc -->
          *
          * @generated
          */
-        EReference SINGLE_REFERENCE_DESCRIPTION__UNSET_OPERATION = PropertiesPackage.eINSTANCE.getSingleReferenceDescription_UnsetOperation();
+        EAttribute WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION = PropertiesPackage.eINSTANCE.getWidgetConditionalStyle_PreconditionExpression();
 
         /**
-         * The meta object literal for the '<em><b>On Click Operation</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.TextWidgetConditionalStyleImpl
+         * <em>Text Widget Conditional Style</em>}' class. <!-- begin-user-doc
+         * --> <!-- end-user-doc -->
          *
+         * @see org.eclipse.sirius.properties.impl.TextWidgetConditionalStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextWidgetConditionalStyle()
          * @generated
          */
-        EReference SINGLE_REFERENCE_DESCRIPTION__ON_CLICK_OPERATION = PropertiesPackage.eINSTANCE.getSingleReferenceDescription_OnClickOperation();
+        EClass TEXT_WIDGET_CONDITIONAL_STYLE = PropertiesPackage.eINSTANCE.getTextWidgetConditionalStyle();
+
+        /**
+         * The meta object literal for the '<em><b>Style</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference TEXT_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.eINSTANCE.getTextWidgetConditionalStyle_Style();
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.properties.impl.OperationDescriptionImpl
-         * <em>Operation Description</em>}' class. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * {@link org.eclipse.sirius.properties.impl.LabelWidgetConditionalStyleImpl
+         * <em>Label Widget Conditional Style</em>}' class. <!-- begin-user-doc
+         * --> <!-- end-user-doc -->
          *
-         * @see org.eclipse.sirius.properties.impl.OperationDescriptionImpl
-         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getOperationDescription()
+         * @see org.eclipse.sirius.properties.impl.LabelWidgetConditionalStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getLabelWidgetConditionalStyle()
          * @generated
          */
-        EClass OPERATION_DESCRIPTION = PropertiesPackage.eINSTANCE.getOperationDescription();
+        EClass LABEL_WIDGET_CONDITIONAL_STYLE = PropertiesPackage.eINSTANCE.getLabelWidgetConditionalStyle();
 
         /**
-         * The meta object literal for the '<em><b>Initial Operation</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * The meta object literal for the '<em><b>Style</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
          *
          * @generated
          */
-        EReference OPERATION_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getOperationDescription_InitialOperation();
+        EReference LABEL_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.eINSTANCE.getLabelWidgetConditionalStyle_Style();
 
         /**
          * The meta object literal for the '
-         * {@link org.eclipse.sirius.properties.impl.MultipleReferencesDescriptionImpl
-         * <em>Multiple References Description</em>}' class. <!-- begin-user-doc
-         * --> <!-- end-user-doc -->
+         * {@link org.eclipse.sirius.properties.impl.CheckboxWidgetConditionalStyleImpl
+         * <em>Checkbox Widget Conditional Style</em>}' class. <!--
+         * begin-user-doc --> <!-- end-user-doc -->
          *
-         * @see org.eclipse.sirius.properties.impl.MultipleReferencesDescriptionImpl
-         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getMultipleReferencesDescription()
+         * @see org.eclipse.sirius.properties.impl.CheckboxWidgetConditionalStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCheckboxWidgetConditionalStyle()
          * @generated
          */
-        EClass MULTIPLE_REFERENCES_DESCRIPTION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription();
+        EClass CHECKBOX_WIDGET_CONDITIONAL_STYLE = PropertiesPackage.eINSTANCE.getCheckboxWidgetConditionalStyle();
 
         /**
-         * The meta object literal for the '<em><b>Value Expression</b></em>'
-         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Style</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
          *
          * @generated
          */
-        EAttribute MULTIPLE_REFERENCES_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_ValueExpression();
+        EReference CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.eINSTANCE.getCheckboxWidgetConditionalStyle_Style();
 
         /**
-         * The meta object literal for the '<em><b>Display Expression</b></em>'
-         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.RadioWidgetConditionalStyleImpl
+         * <em>Radio Widget Conditional Style</em>}' class. <!-- begin-user-doc
+         * --> <!-- end-user-doc -->
          *
+         * @see org.eclipse.sirius.properties.impl.RadioWidgetConditionalStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getRadioWidgetConditionalStyle()
          * @generated
          */
-        EAttribute MULTIPLE_REFERENCES_DESCRIPTION__DISPLAY_EXPRESSION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_DisplayExpression();
+        EClass RADIO_WIDGET_CONDITIONAL_STYLE = PropertiesPackage.eINSTANCE.getRadioWidgetConditionalStyle();
 
         /**
-         * The meta object literal for the '<em><b>Create Operation</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * The meta object literal for the '<em><b>Style</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
          *
          * @generated
          */
-        EReference MULTIPLE_REFERENCES_DESCRIPTION__CREATE_OPERATION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_CreateOperation();
+        EReference RADIO_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.eINSTANCE.getRadioWidgetConditionalStyle_Style();
 
         /**
-         * The meta object literal for the '<em><b>Search Operation</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.ButtonWidgetConditionalStyleImpl
+         * <em>Button Widget Conditional Style</em>}' class. <!-- begin-user-doc
+         * --> <!-- end-user-doc -->
          *
+         * @see org.eclipse.sirius.properties.impl.ButtonWidgetConditionalStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getButtonWidgetConditionalStyle()
          * @generated
          */
-        EReference MULTIPLE_REFERENCES_DESCRIPTION__SEARCH_OPERATION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_SearchOperation();
+        EClass BUTTON_WIDGET_CONDITIONAL_STYLE = PropertiesPackage.eINSTANCE.getButtonWidgetConditionalStyle();
 
         /**
-         * The meta object literal for the '<em><b>Unset Operation</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * The meta object literal for the '<em><b>Style</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
          *
          * @generated
          */
-        EReference MULTIPLE_REFERENCES_DESCRIPTION__UNSET_OPERATION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_UnsetOperation();
+        EReference BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.eINSTANCE.getButtonWidgetConditionalStyle_Style();
 
         /**
-         * The meta object literal for the '<em><b>On Click Operation</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.SelectWidgetConditionalStyleImpl
+         * <em>Select Widget Conditional Style</em>}' class. <!-- begin-user-doc
+         * --> <!-- end-user-doc -->
          *
+         * @see org.eclipse.sirius.properties.impl.SelectWidgetConditionalStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSelectWidgetConditionalStyle()
          * @generated
          */
-        EReference MULTIPLE_REFERENCES_DESCRIPTION__ON_CLICK_OPERATION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_OnClickOperation();
+        EClass SELECT_WIDGET_CONDITIONAL_STYLE = PropertiesPackage.eINSTANCE.getSelectWidgetConditionalStyle();
 
         /**
-         * The meta object literal for the '<em><b>Up Operation</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * The meta object literal for the '<em><b>Style</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
          *
          * @generated
          */
-        EReference MULTIPLE_REFERENCES_DESCRIPTION__UP_OPERATION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_UpOperation();
+        EReference SELECT_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.eINSTANCE.getSelectWidgetConditionalStyle_Style();
 
         /**
-         * The meta object literal for the '<em><b>Down Operation</b></em>'
-         * containment reference feature. <!-- begin-user-doc --> <!--
-         * end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.CustomWidgetConditionalStyleImpl
+         * <em>Custom Widget Conditional Style</em>}' class. <!-- begin-user-doc
+         * --> <!-- end-user-doc -->
          *
+         * @see org.eclipse.sirius.properties.impl.CustomWidgetConditionalStyleImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCustomWidgetConditionalStyle()
          * @generated
          */
-        EReference MULTIPLE_REFERENCES_DESCRIPTION__DOWN_OPERATION = PropertiesPackage.eINSTANCE.getMultipleReferencesDescription_DownOperation();
+        EClass CUSTOM_WIDGET_CONDITIONAL_STYLE = PropertiesPackage.eINSTANCE.getCustomWidgetConditionalStyle();
+
+        /**
+         * The meta object literal for the '<em><b>Style</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EReference CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE = PropertiesPackage.eINSTANCE.getCustomWidgetConditionalStyle_Style();
 
     }
 
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 8b446cf501..31a1936083 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
@@ -11,6 +11,7 @@
  */
 package org.eclipse.sirius.properties;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
@@ -38,6 +39,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em>Style</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.RadioDescription#getNumberOfColumns
  * <em>Number Of Columns</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.RadioDescription#getConditionalStyles
+ * <em>Conditional Styles</em>}</li>
  * </ul>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getRadioDescription()
@@ -217,4 +221,23 @@ public interface RadioDescription extends WidgetDescription {
      */
     void setNumberOfColumns(int value);
 
+    /**
+     * Returns the value of the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. The list contents are of type
+     * {@link org.eclipse.sirius.properties.RadioWidgetConditionalStyle}. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Conditional Styles</em>' containment reference
+     * list isn't clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Conditional Styles</em>' containment
+     *         reference list.
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getRadioDescription_ConditionalStyles()
+     * @model containment="true"
+     * @generated
+     */
+    EList<RadioWidgetConditionalStyle> getConditionalStyles();
+
 } // RadioDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioWidgetConditionalStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioWidgetConditionalStyle.java
new file mode 100644
index 0000000000..0352dc7c9a
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioWidgetConditionalStyle.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Radio Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.sirius.properties.RadioWidgetConditionalStyle#getStyle
+ * <em>Style</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getRadioWidgetConditionalStyle()
+ * @model
+ * @generated
+ */
+public interface RadioWidgetConditionalStyle extends WidgetConditionalStyle {
+    /**
+     * Returns the value of the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Style</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Style</em>' containment reference.
+     * @see #setStyle(RadioWidgetStyle)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getRadioWidgetConditionalStyle_Style()
+     * @model containment="true"
+     * @generated
+     */
+    RadioWidgetStyle getStyle();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.RadioWidgetConditionalStyle#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(RadioWidgetStyle value);
+
+} // RadioWidgetConditionalStyle
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 699f470a08..f0c8efbcae 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
@@ -11,6 +11,7 @@
  */
 package org.eclipse.sirius.properties;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
@@ -37,6 +38,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em>Candidate Display Expression</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.SelectDescription#getStyle
  * <em>Style</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.SelectDescription#getConditionalStyles
+ * <em>Conditional Styles</em>}</li>
  * </ul>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectDescription()
@@ -189,4 +193,23 @@ public interface SelectDescription extends WidgetDescription {
      */
     void setStyle(SelectWidgetStyle value);
 
+    /**
+     * Returns the value of the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. The list contents are of type
+     * {@link org.eclipse.sirius.properties.SelectWidgetConditionalStyle}. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Conditional Styles</em>' containment reference
+     * list isn't clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Conditional Styles</em>' containment
+     *         reference list.
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectDescription_ConditionalStyles()
+     * @model containment="true"
+     * @generated
+     */
+    EList<SelectWidgetConditionalStyle> getConditionalStyles();
+
 } // SelectDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectWidgetConditionalStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectWidgetConditionalStyle.java
new file mode 100644
index 0000000000..19422beff6
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectWidgetConditionalStyle.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Select Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.SelectWidgetConditionalStyle#getStyle
+ * <em>Style</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectWidgetConditionalStyle()
+ * @model
+ * @generated
+ */
+public interface SelectWidgetConditionalStyle extends WidgetConditionalStyle {
+    /**
+     * Returns the value of the '<em><b>Style</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Style</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Style</em>' containment reference.
+     * @see #setStyle(SelectWidgetStyle)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectWidgetConditionalStyle_Style()
+     * @model containment="true"
+     * @generated
+     */
+    SelectWidgetStyle getStyle();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.SelectWidgetConditionalStyle#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(SelectWidgetStyle value);
+
+} // SelectWidgetConditionalStyle
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 a637bdff00..9499d6106c 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
@@ -11,6 +11,7 @@
  */
 package org.eclipse.sirius.properties;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
@@ -27,6 +28,8 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em>Initial Operation</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.TextDescription#getStyle
  * <em>Style</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.TextDescription#getConditionalStyles
+ * <em>Conditional Styles</em>}</li>
  * </ul>
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getTextDescription()
@@ -127,4 +130,23 @@ public interface TextDescription extends WidgetDescription {
      */
     void setStyle(TextWidgetStyle value);
 
+    /**
+     * Returns the value of the '<em><b>Conditional Styles</b></em>' containment
+     * reference list. The list contents are of type
+     * {@link org.eclipse.sirius.properties.TextWidgetConditionalStyle}. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Conditional Styles</em>' containment reference
+     * list isn't clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     *
+     * @return the value of the '<em>Conditional Styles</em>' containment
+     *         reference list.
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextDescription_ConditionalStyles()
+     * @model containment="true"
+     * @generated
+     */
+    EList<TextWidgetConditionalStyle> getConditionalStyles();
+
 } // TextDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextWidgetConditionalStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextWidgetConditionalStyle.java
new file mode 100644
index 0000000000..7125a9f97d
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextWidgetConditionalStyle.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Text Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.sirius.properties.TextWidgetConditionalStyle#getStyle
+ * <em>Style</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getTextWidgetConditionalStyle()
+ * @model
+ * @generated
+ */
+public interface TextWidgetConditionalStyle extends WidgetConditionalStyle {
+    /**
+     * Returns the value of the '<em><b>Style</b></em>' reference. <!--
+     * begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Style</em>' 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>' reference.
+     * @see #setStyle(TextWidgetStyle)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getTextWidgetConditionalStyle_Style()
+     * @model
+     * @generated
+     */
+    TextWidgetStyle getStyle();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.TextWidgetConditionalStyle#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(TextWidgetStyle value);
+
+} // TextWidgetConditionalStyle
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetConditionalStyle.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetConditionalStyle.java
new file mode 100644
index 0000000000..049f32ac38
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetConditionalStyle.java
@@ -0,0 +1,66 @@
+/**
+ * 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 Conditional Style</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.WidgetConditionalStyle#getPreconditionExpression
+ * <em>Precondition Expression</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetConditionalStyle()
+ * @model abstract="true"
+ * @generated
+ */
+public interface WidgetConditionalStyle extends EObject {
+    /**
+     * Returns the value of the '<em><b>Precondition Expression</b></em>'
+     * attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Precondition 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>Precondition Expression</em>' attribute.
+     * @see #setPreconditionExpression(String)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetConditionalStyle_PreconditionExpression()
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @generated
+     */
+    String getPreconditionExpression();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.WidgetConditionalStyle#getPreconditionExpression
+     * <em>Precondition Expression</em>}' attribute. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @param value
+     *            the new value of the '<em>Precondition Expression</em>'
+     *            attribute.
+     * @see #getPreconditionExpression()
+     * @generated
+     */
+    void setPreconditionExpression(String value);
+
+} // WidgetConditionalStyle
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 d746160a3f..26e840a599 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
@@ -11,12 +11,18 @@
  */
 package org.eclipse.sirius.properties.impl;
 
+import java.util.Collection;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.ButtonWidgetConditionalStyle;
 import org.eclipse.sirius.properties.ButtonWidgetStyle;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
@@ -36,6 +42,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em>Initial Operation</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.impl.ButtonDescriptionImpl#getStyle
  * <em>Style</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.ButtonDescriptionImpl#getConditionalStyles
+ * <em>Conditional Styles</em>}</li>
  * </ul>
  *
  * @generated
@@ -85,6 +94,17 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
     protected ButtonWidgetStyle style;
 
     /**
+     * The cached value of the '{@link #getConditionalStyles()
+     * <em>Conditional Styles</em>}' containment reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getConditionalStyles()
+     * @generated
+     * @ordered
+     */
+    protected EList<ButtonWidgetConditionalStyle> conditionalStyles;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -239,12 +259,27 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
      * @generated
      */
     @Override
+    public EList<ButtonWidgetConditionalStyle> getConditionalStyles() {
+        if (conditionalStyles == null) {
+            conditionalStyles = new EObjectContainmentEList<ButtonWidgetConditionalStyle>(ButtonWidgetConditionalStyle.class, this, PropertiesPackage.BUTTON_DESCRIPTION__CONDITIONAL_STYLES);
+        }
+        return conditionalStyles;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
         case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
             return basicSetInitialOperation(null, msgs);
         case PropertiesPackage.BUTTON_DESCRIPTION__STYLE:
             return basicSetStyle(null, msgs);
+        case PropertiesPackage.BUTTON_DESCRIPTION__CONDITIONAL_STYLES:
+            return ((InternalEList<?>) getConditionalStyles()).basicRemove(otherEnd, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
@@ -263,6 +298,8 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
             return getInitialOperation();
         case PropertiesPackage.BUTTON_DESCRIPTION__STYLE:
             return getStyle();
+        case PropertiesPackage.BUTTON_DESCRIPTION__CONDITIONAL_STYLES:
+            return getConditionalStyles();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -272,6 +309,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
      *
      * @generated
      */
+    @SuppressWarnings("unchecked")
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
@@ -284,6 +322,10 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
         case PropertiesPackage.BUTTON_DESCRIPTION__STYLE:
             setStyle((ButtonWidgetStyle) newValue);
             return;
+        case PropertiesPackage.BUTTON_DESCRIPTION__CONDITIONAL_STYLES:
+            getConditionalStyles().clear();
+            getConditionalStyles().addAll((Collection<? extends ButtonWidgetConditionalStyle>) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -305,6 +347,9 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
         case PropertiesPackage.BUTTON_DESCRIPTION__STYLE:
             setStyle((ButtonWidgetStyle) null);
             return;
+        case PropertiesPackage.BUTTON_DESCRIPTION__CONDITIONAL_STYLES:
+            getConditionalStyles().clear();
+            return;
         }
         super.eUnset(featureID);
     }
@@ -324,6 +369,8 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
             return initialOperation != null;
         case PropertiesPackage.BUTTON_DESCRIPTION__STYLE:
             return style != null;
+        case PropertiesPackage.BUTTON_DESCRIPTION__CONDITIONAL_STYLES:
+            return conditionalStyles != null && !conditionalStyles.isEmpty();
         }
         return super.eIsSet(featureID);
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonWidgetConditionalStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonWidgetConditionalStyleImpl.java
new file mode 100644
index 0000000000..ba62bfc9b8
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonWidgetConditionalStyleImpl.java
@@ -0,0 +1,192 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.properties.ButtonWidgetConditionalStyle;
+import org.eclipse.sirius.properties.ButtonWidgetStyle;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Button Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.ButtonWidgetConditionalStyleImpl#getStyle
+ * <em>Style</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ButtonWidgetConditionalStyleImpl extends WidgetConditionalStyleImpl implements ButtonWidgetConditionalStyle {
+    /**
+     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getStyle()
+     * @generated
+     * @ordered
+     */
+    protected ButtonWidgetStyle style;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected ButtonWidgetConditionalStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.BUTTON_WIDGET_CONDITIONAL_STYLE;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public ButtonWidgetStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public NotificationChain basicSetStyle(ButtonWidgetStyle newStyle, NotificationChain msgs) {
+        ButtonWidgetStyle oldStyle = style;
+        style = newStyle;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE, oldStyle, newStyle);
+            if (msgs == null) {
+                msgs = notification;
+            } else {
+                msgs.add(notification);
+            }
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setStyle(ButtonWidgetStyle newStyle) {
+        if (newStyle != style) {
+            NotificationChain msgs = null;
+            if (style != null) {
+                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
+            }
+            if (newStyle != null) {
+                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
+            }
+            msgs = basicSetStyle(newStyle, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE, newStyle, newStyle));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+        case PropertiesPackage.BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return basicSetStyle(null, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case PropertiesPackage.BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return getStyle();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case PropertiesPackage.BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE:
+            setStyle((ButtonWidgetStyle) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE:
+            setStyle((ButtonWidgetStyle) null);
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return style != null;
+        }
+        return super.eIsSet(featureID);
+    }
+
+} // ButtonWidgetConditionalStyleImpl
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 accd93713e..2140335866 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
@@ -11,12 +11,18 @@
  */
 package org.eclipse.sirius.properties.impl;
 
+import java.util.Collection;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle;
 import org.eclipse.sirius.properties.CheckboxWidgetStyle;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
@@ -37,6 +43,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <li>
  * {@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl#getStyle
  * <em>Style</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl#getConditionalStyles
+ * <em>Conditional Styles</em>}</li>
  * </ul>
  *
  * @generated
@@ -86,6 +95,17 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
     protected CheckboxWidgetStyle style;
 
     /**
+     * The cached value of the '{@link #getConditionalStyles()
+     * <em>Conditional Styles</em>}' containment reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getConditionalStyles()
+     * @generated
+     * @ordered
+     */
+    protected EList<CheckboxWidgetConditionalStyle> conditionalStyles;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -240,12 +260,27 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
      * @generated
      */
     @Override
+    public EList<CheckboxWidgetConditionalStyle> getConditionalStyles() {
+        if (conditionalStyles == null) {
+            conditionalStyles = new EObjectContainmentEList<CheckboxWidgetConditionalStyle>(CheckboxWidgetConditionalStyle.class, this, PropertiesPackage.CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES);
+        }
+        return conditionalStyles;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
         case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
             return basicSetInitialOperation(null, msgs);
         case PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE:
             return basicSetStyle(null, msgs);
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES:
+            return ((InternalEList<?>) getConditionalStyles()).basicRemove(otherEnd, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
@@ -264,6 +299,8 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
             return getInitialOperation();
         case PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE:
             return getStyle();
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES:
+            return getConditionalStyles();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -273,6 +310,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
      *
      * @generated
      */
+    @SuppressWarnings("unchecked")
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
@@ -285,6 +323,10 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
         case PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE:
             setStyle((CheckboxWidgetStyle) newValue);
             return;
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES:
+            getConditionalStyles().clear();
+            getConditionalStyles().addAll((Collection<? extends CheckboxWidgetConditionalStyle>) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -306,6 +348,9 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
         case PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE:
             setStyle((CheckboxWidgetStyle) null);
             return;
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES:
+            getConditionalStyles().clear();
+            return;
         }
         super.eUnset(featureID);
     }
@@ -324,6 +369,8 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
             return initialOperation != null;
         case PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE:
             return style != null;
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES:
+            return conditionalStyles != null && !conditionalStyles.isEmpty();
         }
         return super.eIsSet(featureID);
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxWidgetConditionalStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxWidgetConditionalStyleImpl.java
new file mode 100644
index 0000000000..84088b4c4f
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxWidgetConditionalStyleImpl.java
@@ -0,0 +1,192 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle;
+import org.eclipse.sirius.properties.CheckboxWidgetStyle;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Checkbox Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.CheckboxWidgetConditionalStyleImpl#getStyle
+ * <em>Style</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CheckboxWidgetConditionalStyleImpl extends WidgetConditionalStyleImpl implements CheckboxWidgetConditionalStyle {
+    /**
+     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getStyle()
+     * @generated
+     * @ordered
+     */
+    protected CheckboxWidgetStyle style;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected CheckboxWidgetConditionalStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.CHECKBOX_WIDGET_CONDITIONAL_STYLE;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public CheckboxWidgetStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public NotificationChain basicSetStyle(CheckboxWidgetStyle newStyle, NotificationChain msgs) {
+        CheckboxWidgetStyle oldStyle = style;
+        style = newStyle;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE, oldStyle, newStyle);
+            if (msgs == null) {
+                msgs = notification;
+            } else {
+                msgs.add(notification);
+            }
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setStyle(CheckboxWidgetStyle newStyle) {
+        if (newStyle != style) {
+            NotificationChain msgs = null;
+            if (style != null) {
+                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
+            }
+            if (newStyle != null) {
+                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
+            }
+            msgs = basicSetStyle(newStyle, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE, newStyle, newStyle));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+        case PropertiesPackage.CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return basicSetStyle(null, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case PropertiesPackage.CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return getStyle();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case PropertiesPackage.CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE:
+            setStyle((CheckboxWidgetStyle) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE:
+            setStyle((CheckboxWidgetStyle) null);
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return style != null;
+        }
+        return super.eIsSet(featureID);
+    }
+
+} // CheckboxWidgetConditionalStyleImpl
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 cb2283e147..770aa1dbd1 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
@@ -13,15 +13,19 @@ package org.eclipse.sirius.properties.impl;
 
 import java.util.Collection;
 
+import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.properties.CustomDescription;
 import org.eclipse.sirius.properties.CustomExpression;
 import org.eclipse.sirius.properties.CustomOperation;
+import org.eclipse.sirius.properties.CustomWidgetConditionalStyle;
+import org.eclipse.sirius.properties.CustomWidgetStyle;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
@@ -37,6 +41,11 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * <li>
  * {@link org.eclipse.sirius.properties.impl.CustomDescriptionImpl#getCustomOperations
  * <em>Custom Operations</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.impl.CustomDescriptionImpl#getStyle
+ * <em>Style</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.CustomDescriptionImpl#getConditionalStyles
+ * <em>Conditional Styles</em>}</li>
  * </ul>
  *
  * @generated
@@ -65,6 +74,27 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
     protected EList<CustomOperation> customOperations;
 
     /**
+     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getStyle()
+     * @generated
+     * @ordered
+     */
+    protected CustomWidgetStyle style;
+
+    /**
+     * The cached value of the '{@link #getConditionalStyles()
+     * <em>Conditional Styles</em>}' containment reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getConditionalStyles()
+     * @generated
+     * @ordered
+     */
+    protected EList<CustomWidgetConditionalStyle> conditionalStyles;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -115,12 +145,82 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
      * @generated
      */
     @Override
+    public CustomWidgetStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public NotificationChain basicSetStyle(CustomWidgetStyle newStyle, NotificationChain msgs) {
+        CustomWidgetStyle oldStyle = style;
+        style = newStyle;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.CUSTOM_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(CustomWidgetStyle newStyle) {
+        if (newStyle != style) {
+            NotificationChain msgs = null;
+            if (style != null) {
+                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.CUSTOM_DESCRIPTION__STYLE, null, msgs);
+            }
+            if (newStyle != null) {
+                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.CUSTOM_DESCRIPTION__STYLE, null, msgs);
+            }
+            msgs = basicSetStyle(newStyle, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.CUSTOM_DESCRIPTION__STYLE, newStyle, newStyle));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EList<CustomWidgetConditionalStyle> getConditionalStyles() {
+        if (conditionalStyles == null) {
+            conditionalStyles = new EObjectContainmentEList<CustomWidgetConditionalStyle>(CustomWidgetConditionalStyle.class, this, PropertiesPackage.CUSTOM_DESCRIPTION__CONDITIONAL_STYLES);
+        }
+        return conditionalStyles;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
         case PropertiesPackage.CUSTOM_DESCRIPTION__CUSTOM_EXPRESSIONS:
             return ((InternalEList<?>) getCustomExpressions()).basicRemove(otherEnd, msgs);
         case PropertiesPackage.CUSTOM_DESCRIPTION__CUSTOM_OPERATIONS:
             return ((InternalEList<?>) getCustomOperations()).basicRemove(otherEnd, msgs);
+        case PropertiesPackage.CUSTOM_DESCRIPTION__STYLE:
+            return basicSetStyle(null, msgs);
+        case PropertiesPackage.CUSTOM_DESCRIPTION__CONDITIONAL_STYLES:
+            return ((InternalEList<?>) getConditionalStyles()).basicRemove(otherEnd, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
@@ -137,6 +237,10 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
             return getCustomExpressions();
         case PropertiesPackage.CUSTOM_DESCRIPTION__CUSTOM_OPERATIONS:
             return getCustomOperations();
+        case PropertiesPackage.CUSTOM_DESCRIPTION__STYLE:
+            return getStyle();
+        case PropertiesPackage.CUSTOM_DESCRIPTION__CONDITIONAL_STYLES:
+            return getConditionalStyles();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -158,6 +262,13 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
             getCustomOperations().clear();
             getCustomOperations().addAll((Collection<? extends CustomOperation>) newValue);
             return;
+        case PropertiesPackage.CUSTOM_DESCRIPTION__STYLE:
+            setStyle((CustomWidgetStyle) newValue);
+            return;
+        case PropertiesPackage.CUSTOM_DESCRIPTION__CONDITIONAL_STYLES:
+            getConditionalStyles().clear();
+            getConditionalStyles().addAll((Collection<? extends CustomWidgetConditionalStyle>) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -176,6 +287,12 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
         case PropertiesPackage.CUSTOM_DESCRIPTION__CUSTOM_OPERATIONS:
             getCustomOperations().clear();
             return;
+        case PropertiesPackage.CUSTOM_DESCRIPTION__STYLE:
+            setStyle((CustomWidgetStyle) null);
+            return;
+        case PropertiesPackage.CUSTOM_DESCRIPTION__CONDITIONAL_STYLES:
+            getConditionalStyles().clear();
+            return;
         }
         super.eUnset(featureID);
     }
@@ -192,6 +309,10 @@ public class CustomDescriptionImpl extends WidgetDescriptionImpl implements Cust
             return customExpressions != null && !customExpressions.isEmpty();
         case PropertiesPackage.CUSTOM_DESCRIPTION__CUSTOM_OPERATIONS:
             return customOperations != null && !customOperations.isEmpty();
+        case PropertiesPackage.CUSTOM_DESCRIPTION__STYLE:
+            return style != null;
+        case PropertiesPackage.CUSTOM_DESCRIPTION__CONDITIONAL_STYLES:
+            return conditionalStyles != null && !conditionalStyles.isEmpty();
         }
         return super.eIsSet(featureID);
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomWidgetConditionalStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomWidgetConditionalStyleImpl.java
new file mode 100644
index 0000000000..6f17a11eb0
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomWidgetConditionalStyleImpl.java
@@ -0,0 +1,192 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.properties.CustomWidgetConditionalStyle;
+import org.eclipse.sirius.properties.CustomWidgetStyle;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Custom Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.CustomWidgetConditionalStyleImpl#getStyle
+ * <em>Style</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CustomWidgetConditionalStyleImpl extends WidgetConditionalStyleImpl implements CustomWidgetConditionalStyle {
+    /**
+     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getStyle()
+     * @generated
+     * @ordered
+     */
+    protected CustomWidgetStyle style;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected CustomWidgetConditionalStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.CUSTOM_WIDGET_CONDITIONAL_STYLE;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public CustomWidgetStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public NotificationChain basicSetStyle(CustomWidgetStyle newStyle, NotificationChain msgs) {
+        CustomWidgetStyle oldStyle = style;
+        style = newStyle;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE, oldStyle, newStyle);
+            if (msgs == null) {
+                msgs = notification;
+            } else {
+                msgs.add(notification);
+            }
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setStyle(CustomWidgetStyle newStyle) {
+        if (newStyle != style) {
+            NotificationChain msgs = null;
+            if (style != null) {
+                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
+            }
+            if (newStyle != null) {
+                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
+            }
+            msgs = basicSetStyle(newStyle, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE, newStyle, newStyle));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+        case PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return basicSetStyle(null, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return getStyle();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE:
+            setStyle((CustomWidgetStyle) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE:
+            setStyle((CustomWidgetStyle) null);
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return style != null;
+        }
+        return super.eIsSet(featureID);
+    }
+
+} // CustomWidgetConditionalStyleImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomWidgetStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomWidgetStyleImpl.java
new file mode 100644
index 0000000000..8b82343977
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CustomWidgetStyleImpl.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.sirius.properties.CustomWidgetStyle;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Custom Widget Style</b></em>'. <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CustomWidgetStyleImpl extends WidgetStyleImpl implements CustomWidgetStyle {
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected CustomWidgetStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.CUSTOM_WIDGET_STYLE;
+    }
+
+} // CustomWidgetStyleImpl
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 d8611eddbe..522a521f82 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
@@ -11,12 +11,18 @@
  */
 package org.eclipse.sirius.properties.impl;
 
+import java.util.Collection;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.LabelWidgetConditionalStyle;
 import org.eclipse.sirius.properties.LabelWidgetStyle;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
@@ -32,6 +38,9 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * <em>Body Expression</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.impl.LabelDescriptionImpl#getStyle
  * <em>Style</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.LabelDescriptionImpl#getConditionalStyles
+ * <em>Conditional Styles</em>}</li>
  * </ul>
  *
  * @generated
@@ -70,6 +79,17 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
     protected LabelWidgetStyle style;
 
     /**
+     * The cached value of the '{@link #getConditionalStyles()
+     * <em>Conditional Styles</em>}' containment reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getConditionalStyles()
+     * @generated
+     * @ordered
+     */
+    protected EList<LabelWidgetConditionalStyle> conditionalStyles;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -171,10 +191,25 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
      * @generated
      */
     @Override
+    public EList<LabelWidgetConditionalStyle> getConditionalStyles() {
+        if (conditionalStyles == null) {
+            conditionalStyles = new EObjectContainmentEList<LabelWidgetConditionalStyle>(LabelWidgetConditionalStyle.class, this, PropertiesPackage.LABEL_DESCRIPTION__CONDITIONAL_STYLES);
+        }
+        return conditionalStyles;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
         case PropertiesPackage.LABEL_DESCRIPTION__STYLE:
             return basicSetStyle(null, msgs);
+        case PropertiesPackage.LABEL_DESCRIPTION__CONDITIONAL_STYLES:
+            return ((InternalEList<?>) getConditionalStyles()).basicRemove(otherEnd, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
@@ -191,6 +226,8 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
             return getBodyExpression();
         case PropertiesPackage.LABEL_DESCRIPTION__STYLE:
             return getStyle();
+        case PropertiesPackage.LABEL_DESCRIPTION__CONDITIONAL_STYLES:
+            return getConditionalStyles();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -200,6 +237,7 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
      *
      * @generated
      */
+    @SuppressWarnings("unchecked")
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
@@ -209,6 +247,10 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
         case PropertiesPackage.LABEL_DESCRIPTION__STYLE:
             setStyle((LabelWidgetStyle) newValue);
             return;
+        case PropertiesPackage.LABEL_DESCRIPTION__CONDITIONAL_STYLES:
+            getConditionalStyles().clear();
+            getConditionalStyles().addAll((Collection<? extends LabelWidgetConditionalStyle>) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -227,6 +269,9 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
         case PropertiesPackage.LABEL_DESCRIPTION__STYLE:
             setStyle((LabelWidgetStyle) null);
             return;
+        case PropertiesPackage.LABEL_DESCRIPTION__CONDITIONAL_STYLES:
+            getConditionalStyles().clear();
+            return;
         }
         super.eUnset(featureID);
     }
@@ -243,6 +288,8 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
             return LabelDescriptionImpl.BODY_EXPRESSION_EDEFAULT == null ? bodyExpression != null : !LabelDescriptionImpl.BODY_EXPRESSION_EDEFAULT.equals(bodyExpression);
         case PropertiesPackage.LABEL_DESCRIPTION__STYLE:
             return style != null;
+        case PropertiesPackage.LABEL_DESCRIPTION__CONDITIONAL_STYLES:
+            return conditionalStyles != null && !conditionalStyles.isEmpty();
         }
         return super.eIsSet(featureID);
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelWidgetConditionalStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelWidgetConditionalStyleImpl.java
new file mode 100644
index 0000000000..2d5e52f66f
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelWidgetConditionalStyleImpl.java
@@ -0,0 +1,192 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.properties.LabelWidgetConditionalStyle;
+import org.eclipse.sirius.properties.LabelWidgetStyle;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Label Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.LabelWidgetConditionalStyleImpl#getStyle
+ * <em>Style</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class LabelWidgetConditionalStyleImpl extends WidgetConditionalStyleImpl implements LabelWidgetConditionalStyle {
+    /**
+     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getStyle()
+     * @generated
+     * @ordered
+     */
+    protected LabelWidgetStyle style;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected LabelWidgetConditionalStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.LABEL_WIDGET_CONDITIONAL_STYLE;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public LabelWidgetStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public NotificationChain basicSetStyle(LabelWidgetStyle newStyle, NotificationChain msgs) {
+        LabelWidgetStyle oldStyle = style;
+        style = newStyle;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.LABEL_WIDGET_CONDITIONAL_STYLE__STYLE, oldStyle, newStyle);
+            if (msgs == null) {
+                msgs = notification;
+            } else {
+                msgs.add(notification);
+            }
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setStyle(LabelWidgetStyle newStyle) {
+        if (newStyle != style) {
+            NotificationChain msgs = null;
+            if (style != null) {
+                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.LABEL_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
+            }
+            if (newStyle != null) {
+                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.LABEL_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
+            }
+            msgs = basicSetStyle(newStyle, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.LABEL_WIDGET_CONDITIONAL_STYLE__STYLE, newStyle, newStyle));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+        case PropertiesPackage.LABEL_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return basicSetStyle(null, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case PropertiesPackage.LABEL_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return getStyle();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case PropertiesPackage.LABEL_WIDGET_CONDITIONAL_STYLE__STYLE:
+            setStyle((LabelWidgetStyle) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.LABEL_WIDGET_CONDITIONAL_STYLE__STYLE:
+            setStyle((LabelWidgetStyle) null);
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.LABEL_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return style != null;
+        }
+        return super.eIsSet(featureID);
+    }
+
+} // LabelWidgetConditionalStyleImpl
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 1a3d1aeeb3..a568b75d15 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
@@ -17,18 +17,23 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.ButtonWidgetConditionalStyle;
 import org.eclipse.sirius.properties.ButtonWidgetStyle;
 import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle;
 import org.eclipse.sirius.properties.CheckboxWidgetStyle;
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.CustomDescription;
 import org.eclipse.sirius.properties.CustomExpression;
 import org.eclipse.sirius.properties.CustomOperation;
+import org.eclipse.sirius.properties.CustomWidgetConditionalStyle;
+import org.eclipse.sirius.properties.CustomWidgetStyle;
 import org.eclipse.sirius.properties.DynamicMappingFor;
 import org.eclipse.sirius.properties.DynamicMappingIf;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.GroupValidationSetDescription;
 import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.LabelWidgetConditionalStyle;
 import org.eclipse.sirius.properties.LabelWidgetStyle;
 import org.eclipse.sirius.properties.MultipleReferencesDescription;
 import org.eclipse.sirius.properties.OperationDescription;
@@ -38,12 +43,15 @@ import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
 import org.eclipse.sirius.properties.RadioWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
 import org.eclipse.sirius.properties.SelectWidgetStyle;
 import org.eclipse.sirius.properties.SingleReferenceDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.TextWidgetConditionalStyle;
 import org.eclipse.sirius.properties.TextWidgetStyle;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 import org.eclipse.sirius.properties.WidgetStyle;
@@ -149,6 +157,22 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
             return createButtonWidgetStyle();
         case PropertiesPackage.SELECT_WIDGET_STYLE:
             return createSelectWidgetStyle();
+        case PropertiesPackage.CUSTOM_WIDGET_STYLE:
+            return createCustomWidgetStyle();
+        case PropertiesPackage.TEXT_WIDGET_CONDITIONAL_STYLE:
+            return createTextWidgetConditionalStyle();
+        case PropertiesPackage.LABEL_WIDGET_CONDITIONAL_STYLE:
+            return createLabelWidgetConditionalStyle();
+        case PropertiesPackage.CHECKBOX_WIDGET_CONDITIONAL_STYLE:
+            return createCheckboxWidgetConditionalStyle();
+        case PropertiesPackage.RADIO_WIDGET_CONDITIONAL_STYLE:
+            return createRadioWidgetConditionalStyle();
+        case PropertiesPackage.BUTTON_WIDGET_CONDITIONAL_STYLE:
+            return createButtonWidgetConditionalStyle();
+        case PropertiesPackage.SELECT_WIDGET_CONDITIONAL_STYLE:
+            return createSelectWidgetConditionalStyle();
+        case PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE:
+            return createCustomWidgetConditionalStyle();
         default:
             throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
         }
@@ -468,6 +492,94 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * @generated
      */
     @Override
+    public CustomWidgetStyle createCustomWidgetStyle() {
+        CustomWidgetStyleImpl customWidgetStyle = new CustomWidgetStyleImpl();
+        return customWidgetStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public TextWidgetConditionalStyle createTextWidgetConditionalStyle() {
+        TextWidgetConditionalStyleImpl textWidgetConditionalStyle = new TextWidgetConditionalStyleImpl();
+        return textWidgetConditionalStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public LabelWidgetConditionalStyle createLabelWidgetConditionalStyle() {
+        LabelWidgetConditionalStyleImpl labelWidgetConditionalStyle = new LabelWidgetConditionalStyleImpl();
+        return labelWidgetConditionalStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public CheckboxWidgetConditionalStyle createCheckboxWidgetConditionalStyle() {
+        CheckboxWidgetConditionalStyleImpl checkboxWidgetConditionalStyle = new CheckboxWidgetConditionalStyleImpl();
+        return checkboxWidgetConditionalStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public RadioWidgetConditionalStyle createRadioWidgetConditionalStyle() {
+        RadioWidgetConditionalStyleImpl radioWidgetConditionalStyle = new RadioWidgetConditionalStyleImpl();
+        return radioWidgetConditionalStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public ButtonWidgetConditionalStyle createButtonWidgetConditionalStyle() {
+        ButtonWidgetConditionalStyleImpl buttonWidgetConditionalStyle = new ButtonWidgetConditionalStyleImpl();
+        return buttonWidgetConditionalStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public SelectWidgetConditionalStyle createSelectWidgetConditionalStyle() {
+        SelectWidgetConditionalStyleImpl selectWidgetConditionalStyle = new SelectWidgetConditionalStyleImpl();
+        return selectWidgetConditionalStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public CustomWidgetConditionalStyle createCustomWidgetConditionalStyle() {
+        CustomWidgetConditionalStyleImpl customWidgetConditionalStyle = new CustomWidgetConditionalStyleImpl();
+        return customWidgetConditionalStyle;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public TextAreaDescription createTextAreaDescription() {
         TextAreaDescriptionImpl textAreaDescription = new TextAreaDescriptionImpl();
         return textAreaDescription;
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 1a602d0df8..78e736186a 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
@@ -18,18 +18,23 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.ButtonWidgetConditionalStyle;
 import org.eclipse.sirius.properties.ButtonWidgetStyle;
 import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle;
 import org.eclipse.sirius.properties.CheckboxWidgetStyle;
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.CustomDescription;
 import org.eclipse.sirius.properties.CustomExpression;
 import org.eclipse.sirius.properties.CustomOperation;
+import org.eclipse.sirius.properties.CustomWidgetConditionalStyle;
+import org.eclipse.sirius.properties.CustomWidgetStyle;
 import org.eclipse.sirius.properties.DynamicMappingFor;
 import org.eclipse.sirius.properties.DynamicMappingIf;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.GroupValidationSetDescription;
 import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.LabelWidgetConditionalStyle;
 import org.eclipse.sirius.properties.LabelWidgetStyle;
 import org.eclipse.sirius.properties.MultipleReferencesDescription;
 import org.eclipse.sirius.properties.OperationDescription;
@@ -39,14 +44,18 @@ import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
 import org.eclipse.sirius.properties.RadioWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
 import org.eclipse.sirius.properties.SelectWidgetStyle;
 import org.eclipse.sirius.properties.SingleReferenceDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.TextWidgetConditionalStyle;
 import org.eclipse.sirius.properties.TextWidgetStyle;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
+import org.eclipse.sirius.properties.WidgetConditionalStyle;
 import org.eclipse.sirius.properties.WidgetDescription;
 import org.eclipse.sirius.properties.WidgetStyle;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
@@ -272,6 +281,69 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     private EClass selectWidgetStyleEClass = null;
 
     /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass customWidgetStyleEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass widgetConditionalStyleEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass textWidgetConditionalStyleEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass labelWidgetConditionalStyleEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass checkboxWidgetConditionalStyleEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass radioWidgetConditionalStyleEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass buttonWidgetConditionalStyleEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass selectWidgetConditionalStyleEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    private EClass customWidgetConditionalStyleEClass = 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.
@@ -746,6 +818,16 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
+    public EReference getTextDescription_ConditionalStyles() {
+        return (EReference) textDescriptionEClass.getEStructuralFeatures().get(3);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public EClass getButtonDescription() {
         return buttonDescriptionEClass;
     }
@@ -786,6 +868,16 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
+    public EReference getButtonDescription_ConditionalStyles() {
+        return (EReference) buttonDescriptionEClass.getEStructuralFeatures().get(3);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public EClass getLabelDescription() {
         return labelDescriptionEClass;
     }
@@ -816,6 +908,16 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
+    public EReference getLabelDescription_ConditionalStyles() {
+        return (EReference) labelDescriptionEClass.getEStructuralFeatures().get(2);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public EClass getCheckboxDescription() {
         return checkboxDescriptionEClass;
     }
@@ -856,6 +958,16 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
+    public EReference getCheckboxDescription_ConditionalStyles() {
+        return (EReference) checkboxDescriptionEClass.getEStructuralFeatures().get(3);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public EClass getSelectDescription() {
         return selectDescriptionEClass;
     }
@@ -916,6 +1028,16 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
+    public EReference getSelectDescription_ConditionalStyles() {
+        return (EReference) selectDescriptionEClass.getEStructuralFeatures().get(5);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public EClass getDynamicMappingFor() {
         return dynamicMappingForEClass;
     }
@@ -1076,6 +1198,16 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
+    public EReference getRadioDescription_ConditionalStyles() {
+        return (EReference) radioDescriptionEClass.getEStructuralFeatures().get(6);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public EClass getSingleReferenceDescription() {
         return singleReferenceDescriptionEClass;
     }
@@ -1286,6 +1418,26 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
+    public EReference getCustomDescription_Style() {
+        return (EReference) customDescriptionEClass.getEStructuralFeatures().get(2);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getCustomDescription_ConditionalStyles() {
+        return (EReference) customDescriptionEClass.getEStructuralFeatures().get(3);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public EClass getCustomExpression() {
         return customExpressionEClass;
     }
@@ -1566,6 +1718,176 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     @Override
+    public EClass getCustomWidgetStyle() {
+        return customWidgetStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EClass getWidgetConditionalStyle() {
+        return widgetConditionalStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EAttribute getWidgetConditionalStyle_PreconditionExpression() {
+        return (EAttribute) widgetConditionalStyleEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EClass getTextWidgetConditionalStyle() {
+        return textWidgetConditionalStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getTextWidgetConditionalStyle_Style() {
+        return (EReference) textWidgetConditionalStyleEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EClass getLabelWidgetConditionalStyle() {
+        return labelWidgetConditionalStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getLabelWidgetConditionalStyle_Style() {
+        return (EReference) labelWidgetConditionalStyleEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EClass getCheckboxWidgetConditionalStyle() {
+        return checkboxWidgetConditionalStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getCheckboxWidgetConditionalStyle_Style() {
+        return (EReference) checkboxWidgetConditionalStyleEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EClass getRadioWidgetConditionalStyle() {
+        return radioWidgetConditionalStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getRadioWidgetConditionalStyle_Style() {
+        return (EReference) radioWidgetConditionalStyleEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EClass getButtonWidgetConditionalStyle() {
+        return buttonWidgetConditionalStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getButtonWidgetConditionalStyle_Style() {
+        return (EReference) buttonWidgetConditionalStyleEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EClass getSelectWidgetConditionalStyle() {
+        return selectWidgetConditionalStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getSelectWidgetConditionalStyle_Style() {
+        return (EReference) selectWidgetConditionalStyleEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EClass getCustomWidgetConditionalStyle() {
+        return customWidgetConditionalStyleEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public EReference getCustomWidgetConditionalStyle_Style() {
+        return (EReference) customWidgetConditionalStyleEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public PropertiesFactory getPropertiesFactory() {
         return (PropertiesFactory) getEFactoryInstance();
     }
@@ -1639,20 +1961,24 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         createEAttribute(textDescriptionEClass, PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION);
         createEReference(textDescriptionEClass, PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION);
         createEReference(textDescriptionEClass, PropertiesPackage.TEXT_DESCRIPTION__STYLE);
+        createEReference(textDescriptionEClass, PropertiesPackage.TEXT_DESCRIPTION__CONDITIONAL_STYLES);
 
         buttonDescriptionEClass = createEClass(PropertiesPackage.BUTTON_DESCRIPTION);
         createEAttribute(buttonDescriptionEClass, PropertiesPackage.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION);
         createEReference(buttonDescriptionEClass, PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION);
         createEReference(buttonDescriptionEClass, PropertiesPackage.BUTTON_DESCRIPTION__STYLE);
+        createEReference(buttonDescriptionEClass, PropertiesPackage.BUTTON_DESCRIPTION__CONDITIONAL_STYLES);
 
         labelDescriptionEClass = createEClass(PropertiesPackage.LABEL_DESCRIPTION);
         createEAttribute(labelDescriptionEClass, PropertiesPackage.LABEL_DESCRIPTION__BODY_EXPRESSION);
         createEReference(labelDescriptionEClass, PropertiesPackage.LABEL_DESCRIPTION__STYLE);
+        createEReference(labelDescriptionEClass, PropertiesPackage.LABEL_DESCRIPTION__CONDITIONAL_STYLES);
 
         checkboxDescriptionEClass = createEClass(PropertiesPackage.CHECKBOX_DESCRIPTION);
         createEAttribute(checkboxDescriptionEClass, PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION);
         createEReference(checkboxDescriptionEClass, PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION);
         createEReference(checkboxDescriptionEClass, PropertiesPackage.CHECKBOX_DESCRIPTION__STYLE);
+        createEReference(checkboxDescriptionEClass, PropertiesPackage.CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES);
 
         selectDescriptionEClass = createEClass(PropertiesPackage.SELECT_DESCRIPTION);
         createEAttribute(selectDescriptionEClass, PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION);
@@ -1660,6 +1986,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         createEAttribute(selectDescriptionEClass, PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION);
         createEAttribute(selectDescriptionEClass, PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION);
         createEReference(selectDescriptionEClass, PropertiesPackage.SELECT_DESCRIPTION__STYLE);
+        createEReference(selectDescriptionEClass, PropertiesPackage.SELECT_DESCRIPTION__CONDITIONAL_STYLES);
 
         dynamicMappingForEClass = createEClass(PropertiesPackage.DYNAMIC_MAPPING_FOR);
         createEAttribute(dynamicMappingForEClass, PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR);
@@ -1680,6 +2007,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         createEAttribute(radioDescriptionEClass, PropertiesPackage.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION);
         createEReference(radioDescriptionEClass, PropertiesPackage.RADIO_DESCRIPTION__STYLE);
         createEAttribute(radioDescriptionEClass, PropertiesPackage.RADIO_DESCRIPTION__NUMBER_OF_COLUMNS);
+        createEReference(radioDescriptionEClass, PropertiesPackage.RADIO_DESCRIPTION__CONDITIONAL_STYLES);
 
         singleReferenceDescriptionEClass = createEClass(PropertiesPackage.SINGLE_REFERENCE_DESCRIPTION);
         createEAttribute(singleReferenceDescriptionEClass, PropertiesPackage.SINGLE_REFERENCE_DESCRIPTION__VALUE_EXPRESSION);
@@ -1705,6 +2033,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         customDescriptionEClass = createEClass(PropertiesPackage.CUSTOM_DESCRIPTION);
         createEReference(customDescriptionEClass, PropertiesPackage.CUSTOM_DESCRIPTION__CUSTOM_EXPRESSIONS);
         createEReference(customDescriptionEClass, PropertiesPackage.CUSTOM_DESCRIPTION__CUSTOM_OPERATIONS);
+        createEReference(customDescriptionEClass, PropertiesPackage.CUSTOM_DESCRIPTION__STYLE);
+        createEReference(customDescriptionEClass, PropertiesPackage.CUSTOM_DESCRIPTION__CONDITIONAL_STYLES);
 
         customExpressionEClass = createEClass(PropertiesPackage.CUSTOM_EXPRESSION);
         createEAttribute(customExpressionEClass, PropertiesPackage.CUSTOM_EXPRESSION__IDENTIFIER);
@@ -1742,6 +2072,32 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         buttonWidgetStyleEClass = createEClass(PropertiesPackage.BUTTON_WIDGET_STYLE);
 
         selectWidgetStyleEClass = createEClass(PropertiesPackage.SELECT_WIDGET_STYLE);
+
+        customWidgetStyleEClass = createEClass(PropertiesPackage.CUSTOM_WIDGET_STYLE);
+
+        widgetConditionalStyleEClass = createEClass(PropertiesPackage.WIDGET_CONDITIONAL_STYLE);
+        createEAttribute(widgetConditionalStyleEClass, PropertiesPackage.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION);
+
+        textWidgetConditionalStyleEClass = createEClass(PropertiesPackage.TEXT_WIDGET_CONDITIONAL_STYLE);
+        createEReference(textWidgetConditionalStyleEClass, PropertiesPackage.TEXT_WIDGET_CONDITIONAL_STYLE__STYLE);
+
+        labelWidgetConditionalStyleEClass = createEClass(PropertiesPackage.LABEL_WIDGET_CONDITIONAL_STYLE);
+        createEReference(labelWidgetConditionalStyleEClass, PropertiesPackage.LABEL_WIDGET_CONDITIONAL_STYLE__STYLE);
+
+        checkboxWidgetConditionalStyleEClass = createEClass(PropertiesPackage.CHECKBOX_WIDGET_CONDITIONAL_STYLE);
+        createEReference(checkboxWidgetConditionalStyleEClass, PropertiesPackage.CHECKBOX_WIDGET_CONDITIONAL_STYLE__STYLE);
+
+        radioWidgetConditionalStyleEClass = createEClass(PropertiesPackage.RADIO_WIDGET_CONDITIONAL_STYLE);
+        createEReference(radioWidgetConditionalStyleEClass, PropertiesPackage.RADIO_WIDGET_CONDITIONAL_STYLE__STYLE);
+
+        buttonWidgetConditionalStyleEClass = createEClass(PropertiesPackage.BUTTON_WIDGET_CONDITIONAL_STYLE);
+        createEReference(buttonWidgetConditionalStyleEClass, PropertiesPackage.BUTTON_WIDGET_CONDITIONAL_STYLE__STYLE);
+
+        selectWidgetConditionalStyleEClass = createEClass(PropertiesPackage.SELECT_WIDGET_CONDITIONAL_STYLE);
+        createEReference(selectWidgetConditionalStyleEClass, PropertiesPackage.SELECT_WIDGET_CONDITIONAL_STYLE__STYLE);
+
+        customWidgetConditionalStyleEClass = createEClass(PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE);
+        createEReference(customWidgetConditionalStyleEClass, PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE__STYLE);
     }
 
     /**
@@ -1799,6 +2155,14 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         radioWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
         buttonWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
         selectWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
+        customWidgetStyleEClass.getESuperTypes().add(this.getWidgetStyle());
+        textWidgetConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
+        labelWidgetConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
+        checkboxWidgetConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
+        radioWidgetConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
+        buttonWidgetConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
+        selectWidgetConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
+        customWidgetConditionalStyleEClass.getESuperTypes().add(this.getWidgetConditionalStyle());
 
         // Initialize classes and features; add operations and parameters
         initEClass(viewExtensionDescriptionEClass, ViewExtensionDescription.class, "ViewExtensionDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
@@ -1903,6 +2267,9 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEReference(getTextDescription_Style(), this.getTextWidgetStyle(), 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);
+        initEReference(getTextDescription_ConditionalStyles(), this.getTextWidgetConditionalStyle(), null, "conditionalStyles", 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,
@@ -1914,6 +2281,9 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEReference(getButtonDescription_Style(), this.getButtonWidgetStyle(), null, "style", null, 0, 1, ButtonDescription.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(getButtonDescription_ConditionalStyles(), this.getButtonWidgetConditionalStyle(), null, "conditionalStyles", null, 0, -1, ButtonDescription.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(labelDescriptionEClass, LabelDescription.class, "LabelDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getLabelDescription_BodyExpression(), theDescriptionPackage.getInterpretedExpression(), "bodyExpression", null, 0, 1, LabelDescription.class, !EPackageImpl.IS_TRANSIENT,
@@ -1921,6 +2291,9 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEReference(getLabelDescription_Style(), this.getLabelWidgetStyle(), null, "style", null, 0, 1, LabelDescription.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(getLabelDescription_ConditionalStyles(), this.getLabelWidgetConditionalStyle(), null, "conditionalStyles", null, 0, -1, LabelDescription.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(checkboxDescriptionEClass, CheckboxDescription.class, "CheckboxDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getCheckboxDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, CheckboxDescription.class, !EPackageImpl.IS_TRANSIENT,
@@ -1931,6 +2304,9 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEReference(getCheckboxDescription_Style(), this.getCheckboxWidgetStyle(), null, "style", null, 0, 1, CheckboxDescription.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(getCheckboxDescription_ConditionalStyles(), this.getCheckboxWidgetConditionalStyle(), null, "conditionalStyles", null, 0, -1, CheckboxDescription.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(selectDescriptionEClass, SelectDescription.class, "SelectDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getSelectDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, SelectDescription.class, !EPackageImpl.IS_TRANSIENT,
@@ -1947,6 +2323,9 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEReference(getSelectDescription_Style(), this.getSelectWidgetStyle(), null, "style", null, 0, 1, SelectDescription.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(getSelectDescription_ConditionalStyles(), this.getSelectWidgetConditionalStyle(), null, "conditionalStyles", null, 0, -1, SelectDescription.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(dynamicMappingForEClass, DynamicMappingFor.class, "DynamicMappingFor", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getDynamicMappingFor_Iterator(), theEcorePackage.getEString(), "iterator", null, 1, 1, DynamicMappingFor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
@@ -1985,6 +2364,9 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
                 EPackageImpl.IS_ORDERED);
         initEAttribute(getRadioDescription_NumberOfColumns(), theEcorePackage.getEInt(), "numberOfColumns", "-1", 0, 1, RadioDescription.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(getRadioDescription_ConditionalStyles(), this.getRadioWidgetConditionalStyle(), null, "conditionalStyles", null, 0, -1, RadioDescription.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(singleReferenceDescriptionEClass, SingleReferenceDescription.class, "SingleReferenceDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
                 EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
@@ -2046,6 +2428,12 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEReference(getCustomDescription_CustomOperations(), this.getCustomOperation(), null, "customOperations", null, 0, -1, CustomDescription.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(getCustomDescription_Style(), this.getCustomWidgetStyle(), null, "style", null, 0, 1, CustomDescription.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(getCustomDescription_ConditionalStyles(), this.getCustomWidgetConditionalStyle(), null, "conditionalStyles", null, 0, -1, CustomDescription.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(customExpressionEClass, CustomExpression.class, "CustomExpression", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getCustomExpression_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, CustomExpression.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
@@ -2110,6 +2498,56 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
 
         initEClass(selectWidgetStyleEClass, SelectWidgetStyle.class, "SelectWidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
 
+        initEClass(customWidgetStyleEClass, CustomWidgetStyle.class, "CustomWidgetStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+
+        initEClass(widgetConditionalStyleEClass, WidgetConditionalStyle.class, "WidgetConditionalStyle", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
+                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getWidgetConditionalStyle_PreconditionExpression(), theDescriptionPackage.getInterpretedExpression(), "preconditionExpression", null, 0, 1, WidgetConditionalStyle.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);
+
+        initEClass(textWidgetConditionalStyleEClass, TextWidgetConditionalStyle.class, "TextWidgetConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
+                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getTextWidgetConditionalStyle_Style(), this.getTextWidgetStyle(), null, "style", null, 0, 1, TextWidgetConditionalStyle.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(labelWidgetConditionalStyleEClass, LabelWidgetConditionalStyle.class, "LabelWidgetConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
+                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getLabelWidgetConditionalStyle_Style(), this.getLabelWidgetStyle(), null, "style", null, 0, 1, LabelWidgetConditionalStyle.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(checkboxWidgetConditionalStyleEClass, CheckboxWidgetConditionalStyle.class, "CheckboxWidgetConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
+                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getCheckboxWidgetConditionalStyle_Style(), this.getCheckboxWidgetStyle(), null, "style", null, 0, 1, CheckboxWidgetConditionalStyle.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(radioWidgetConditionalStyleEClass, RadioWidgetConditionalStyle.class, "RadioWidgetConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
+                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getRadioWidgetConditionalStyle_Style(), this.getRadioWidgetStyle(), null, "style", null, 0, 1, RadioWidgetConditionalStyle.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(buttonWidgetConditionalStyleEClass, ButtonWidgetConditionalStyle.class, "ButtonWidgetConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
+                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getButtonWidgetConditionalStyle_Style(), this.getButtonWidgetStyle(), null, "style", null, 0, 1, ButtonWidgetConditionalStyle.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(selectWidgetConditionalStyleEClass, SelectWidgetConditionalStyle.class, "SelectWidgetConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
+                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getSelectWidgetConditionalStyle_Style(), this.getSelectWidgetStyle(), null, "style", null, 0, 1, SelectWidgetConditionalStyle.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(customWidgetConditionalStyleEClass, CustomWidgetConditionalStyle.class, "CustomWidgetConditionalStyle", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
+                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getCustomWidgetConditionalStyle_Style(), this.getCustomWidgetStyle(), null, "style", null, 0, 1, CustomWidgetConditionalStyle.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);
+
         // Create resource
         createResource(PropertiesPackage.eNS_URI);
     }
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 d3cd7b2822..1c2a7a81f6 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
@@ -11,13 +11,19 @@
  */
 package org.eclipse.sirius.properties.impl;
 
+import java.util.Collection;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
 import org.eclipse.sirius.properties.RadioWidgetStyle;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
@@ -45,6 +51,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <li>
  * {@link org.eclipse.sirius.properties.impl.RadioDescriptionImpl#getNumberOfColumns
  * <em>Number Of Columns</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.RadioDescriptionImpl#getConditionalStyles
+ * <em>Conditional Styles</em>}</li>
  * </ul>
  *
  * @generated
@@ -160,6 +169,17 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
     protected int numberOfColumns = RadioDescriptionImpl.NUMBER_OF_COLUMNS_EDEFAULT;
 
     /**
+     * The cached value of the '{@link #getConditionalStyles()
+     * <em>Conditional Styles</em>}' containment reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getConditionalStyles()
+     * @generated
+     * @ordered
+     */
+    protected EList<RadioWidgetConditionalStyle> conditionalStyles;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -386,12 +406,27 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
      * @generated
      */
     @Override
+    public EList<RadioWidgetConditionalStyle> getConditionalStyles() {
+        if (conditionalStyles == null) {
+            conditionalStyles = new EObjectContainmentEList<RadioWidgetConditionalStyle>(RadioWidgetConditionalStyle.class, this, PropertiesPackage.RADIO_DESCRIPTION__CONDITIONAL_STYLES);
+        }
+        return conditionalStyles;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
         case PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION:
             return basicSetInitialOperation(null, msgs);
         case PropertiesPackage.RADIO_DESCRIPTION__STYLE:
             return basicSetStyle(null, msgs);
+        case PropertiesPackage.RADIO_DESCRIPTION__CONDITIONAL_STYLES:
+            return ((InternalEList<?>) getConditionalStyles()).basicRemove(otherEnd, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
@@ -416,6 +451,8 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
             return getStyle();
         case PropertiesPackage.RADIO_DESCRIPTION__NUMBER_OF_COLUMNS:
             return getNumberOfColumns();
+        case PropertiesPackage.RADIO_DESCRIPTION__CONDITIONAL_STYLES:
+            return getConditionalStyles();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -425,6 +462,7 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
      *
      * @generated
      */
+    @SuppressWarnings("unchecked")
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
@@ -446,6 +484,10 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
         case PropertiesPackage.RADIO_DESCRIPTION__NUMBER_OF_COLUMNS:
             setNumberOfColumns((Integer) newValue);
             return;
+        case PropertiesPackage.RADIO_DESCRIPTION__CONDITIONAL_STYLES:
+            getConditionalStyles().clear();
+            getConditionalStyles().addAll((Collection<? extends RadioWidgetConditionalStyle>) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -476,6 +518,9 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
         case PropertiesPackage.RADIO_DESCRIPTION__NUMBER_OF_COLUMNS:
             setNumberOfColumns(RadioDescriptionImpl.NUMBER_OF_COLUMNS_EDEFAULT);
             return;
+        case PropertiesPackage.RADIO_DESCRIPTION__CONDITIONAL_STYLES:
+            getConditionalStyles().clear();
+            return;
         }
         super.eUnset(featureID);
     }
@@ -501,6 +546,8 @@ public class RadioDescriptionImpl extends WidgetDescriptionImpl implements Radio
             return style != null;
         case PropertiesPackage.RADIO_DESCRIPTION__NUMBER_OF_COLUMNS:
             return numberOfColumns != RadioDescriptionImpl.NUMBER_OF_COLUMNS_EDEFAULT;
+        case PropertiesPackage.RADIO_DESCRIPTION__CONDITIONAL_STYLES:
+            return conditionalStyles != null && !conditionalStyles.isEmpty();
         }
         return super.eIsSet(featureID);
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioWidgetConditionalStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioWidgetConditionalStyleImpl.java
new file mode 100644
index 0000000000..4ef3285ae6
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioWidgetConditionalStyleImpl.java
@@ -0,0 +1,192 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
+import org.eclipse.sirius.properties.RadioWidgetStyle;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Radio Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.RadioWidgetConditionalStyleImpl#getStyle
+ * <em>Style</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class RadioWidgetConditionalStyleImpl extends WidgetConditionalStyleImpl implements RadioWidgetConditionalStyle {
+    /**
+     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getStyle()
+     * @generated
+     * @ordered
+     */
+    protected RadioWidgetStyle style;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected RadioWidgetConditionalStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.RADIO_WIDGET_CONDITIONAL_STYLE;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public RadioWidgetStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public NotificationChain basicSetStyle(RadioWidgetStyle newStyle, NotificationChain msgs) {
+        RadioWidgetStyle oldStyle = style;
+        style = newStyle;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.RADIO_WIDGET_CONDITIONAL_STYLE__STYLE, oldStyle, newStyle);
+            if (msgs == null) {
+                msgs = notification;
+            } else {
+                msgs.add(notification);
+            }
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setStyle(RadioWidgetStyle newStyle) {
+        if (newStyle != style) {
+            NotificationChain msgs = null;
+            if (style != null) {
+                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.RADIO_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
+            }
+            if (newStyle != null) {
+                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.RADIO_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
+            }
+            msgs = basicSetStyle(newStyle, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.RADIO_WIDGET_CONDITIONAL_STYLE__STYLE, newStyle, newStyle));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+        case PropertiesPackage.RADIO_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return basicSetStyle(null, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case PropertiesPackage.RADIO_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return getStyle();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case PropertiesPackage.RADIO_WIDGET_CONDITIONAL_STYLE__STYLE:
+            setStyle((RadioWidgetStyle) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.RADIO_WIDGET_CONDITIONAL_STYLE__STYLE:
+            setStyle((RadioWidgetStyle) null);
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.RADIO_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return style != null;
+        }
+        return super.eIsSet(featureID);
+    }
+
+} // RadioWidgetConditionalStyleImpl
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 fc99d74199..26f4cadbbd 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
@@ -11,13 +11,19 @@
  */
 package org.eclipse.sirius.properties.impl;
 
+import java.util.Collection;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
 import org.eclipse.sirius.properties.SelectWidgetStyle;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
@@ -42,6 +48,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em>Candidate Display Expression</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getStyle
  * <em>Style</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getConditionalStyles
+ * <em>Conditional Styles</em>}</li>
  * </ul>
  *
  * @generated
@@ -135,6 +144,17 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     protected SelectWidgetStyle style;
 
     /**
+     * The cached value of the '{@link #getConditionalStyles()
+     * <em>Conditional Styles</em>}' containment reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getConditionalStyles()
+     * @generated
+     * @ordered
+     */
+    protected EList<SelectWidgetConditionalStyle> conditionalStyles;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -337,12 +357,27 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * @generated
      */
     @Override
+    public EList<SelectWidgetConditionalStyle> getConditionalStyles() {
+        if (conditionalStyles == null) {
+            conditionalStyles = new EObjectContainmentEList<SelectWidgetConditionalStyle>(SelectWidgetConditionalStyle.class, this, PropertiesPackage.SELECT_DESCRIPTION__CONDITIONAL_STYLES);
+        }
+        return conditionalStyles;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
         case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
             return basicSetInitialOperation(null, msgs);
         case PropertiesPackage.SELECT_DESCRIPTION__STYLE:
             return basicSetStyle(null, msgs);
+        case PropertiesPackage.SELECT_DESCRIPTION__CONDITIONAL_STYLES:
+            return ((InternalEList<?>) getConditionalStyles()).basicRemove(otherEnd, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
@@ -365,6 +400,8 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
             return getCandidateDisplayExpression();
         case PropertiesPackage.SELECT_DESCRIPTION__STYLE:
             return getStyle();
+        case PropertiesPackage.SELECT_DESCRIPTION__CONDITIONAL_STYLES:
+            return getConditionalStyles();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -374,6 +411,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      *
      * @generated
      */
+    @SuppressWarnings("unchecked")
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
@@ -392,6 +430,10 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
         case PropertiesPackage.SELECT_DESCRIPTION__STYLE:
             setStyle((SelectWidgetStyle) newValue);
             return;
+        case PropertiesPackage.SELECT_DESCRIPTION__CONDITIONAL_STYLES:
+            getConditionalStyles().clear();
+            getConditionalStyles().addAll((Collection<? extends SelectWidgetConditionalStyle>) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -419,6 +461,9 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
         case PropertiesPackage.SELECT_DESCRIPTION__STYLE:
             setStyle((SelectWidgetStyle) null);
             return;
+        case PropertiesPackage.SELECT_DESCRIPTION__CONDITIONAL_STYLES:
+            getConditionalStyles().clear();
+            return;
         }
         super.eUnset(featureID);
     }
@@ -442,6 +487,8 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
                     : !SelectDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT.equals(candidateDisplayExpression);
         case PropertiesPackage.SELECT_DESCRIPTION__STYLE:
             return style != null;
+        case PropertiesPackage.SELECT_DESCRIPTION__CONDITIONAL_STYLES:
+            return conditionalStyles != null && !conditionalStyles.isEmpty();
         }
         return super.eIsSet(featureID);
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectWidgetConditionalStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectWidgetConditionalStyleImpl.java
new file mode 100644
index 0000000000..e21370209c
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectWidgetConditionalStyleImpl.java
@@ -0,0 +1,192 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
+import org.eclipse.sirius.properties.SelectWidgetStyle;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Select Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.SelectWidgetConditionalStyleImpl#getStyle
+ * <em>Style</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class SelectWidgetConditionalStyleImpl extends WidgetConditionalStyleImpl implements SelectWidgetConditionalStyle {
+    /**
+     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getStyle()
+     * @generated
+     * @ordered
+     */
+    protected SelectWidgetStyle style;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected SelectWidgetConditionalStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.SELECT_WIDGET_CONDITIONAL_STYLE;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public SelectWidgetStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public NotificationChain basicSetStyle(SelectWidgetStyle newStyle, NotificationChain msgs) {
+        SelectWidgetStyle oldStyle = style;
+        style = newStyle;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_WIDGET_CONDITIONAL_STYLE__STYLE, oldStyle, newStyle);
+            if (msgs == null) {
+                msgs = notification;
+            } else {
+                msgs.add(notification);
+            }
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setStyle(SelectWidgetStyle newStyle) {
+        if (newStyle != style) {
+            NotificationChain msgs = null;
+            if (style != null) {
+                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.SELECT_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
+            }
+            if (newStyle != null) {
+                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.SELECT_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
+            }
+            msgs = basicSetStyle(newStyle, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_WIDGET_CONDITIONAL_STYLE__STYLE, newStyle, newStyle));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+        case PropertiesPackage.SELECT_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return basicSetStyle(null, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case PropertiesPackage.SELECT_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return getStyle();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case PropertiesPackage.SELECT_WIDGET_CONDITIONAL_STYLE__STYLE:
+            setStyle((SelectWidgetStyle) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.SELECT_WIDGET_CONDITIONAL_STYLE__STYLE:
+            setStyle((SelectWidgetStyle) null);
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.SELECT_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return style != null;
+        }
+        return super.eIsSet(featureID);
+    }
+
+} // SelectWidgetConditionalStyleImpl
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 0041ef351e..0fcc3c6d4d 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
@@ -11,13 +11,19 @@
  */
 package org.eclipse.sirius.properties.impl;
 
+import java.util.Collection;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.TextWidgetConditionalStyle;
 import org.eclipse.sirius.properties.TextWidgetStyle;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
@@ -36,6 +42,9 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  * <em>Initial Operation</em>}</li>
  * <li>{@link org.eclipse.sirius.properties.impl.TextDescriptionImpl#getStyle
  * <em>Style</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.TextDescriptionImpl#getConditionalStyles
+ * <em>Conditional Styles</em>}</li>
  * </ul>
  *
  * @generated
@@ -85,6 +94,17 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     protected TextWidgetStyle style;
 
     /**
+     * The cached value of the '{@link #getConditionalStyles()
+     * <em>Conditional Styles</em>}' containment reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getConditionalStyles()
+     * @generated
+     * @ordered
+     */
+    protected EList<TextWidgetConditionalStyle> conditionalStyles;
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
@@ -239,12 +259,27 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      * @generated
      */
     @Override
+    public EList<TextWidgetConditionalStyle> getConditionalStyles() {
+        if (conditionalStyles == null) {
+            conditionalStyles = new EObjectContainmentEList<TextWidgetConditionalStyle>(TextWidgetConditionalStyle.class, this, PropertiesPackage.TEXT_DESCRIPTION__CONDITIONAL_STYLES);
+        }
+        return conditionalStyles;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
         case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
             return basicSetInitialOperation(null, msgs);
         case PropertiesPackage.TEXT_DESCRIPTION__STYLE:
             return basicSetStyle(null, msgs);
+        case PropertiesPackage.TEXT_DESCRIPTION__CONDITIONAL_STYLES:
+            return ((InternalEList<?>) getConditionalStyles()).basicRemove(otherEnd, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
@@ -263,6 +298,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
             return getInitialOperation();
         case PropertiesPackage.TEXT_DESCRIPTION__STYLE:
             return getStyle();
+        case PropertiesPackage.TEXT_DESCRIPTION__CONDITIONAL_STYLES:
+            return getConditionalStyles();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -272,6 +309,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      *
      * @generated
      */
+    @SuppressWarnings("unchecked")
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
@@ -284,6 +322,10 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
         case PropertiesPackage.TEXT_DESCRIPTION__STYLE:
             setStyle((TextWidgetStyle) newValue);
             return;
+        case PropertiesPackage.TEXT_DESCRIPTION__CONDITIONAL_STYLES:
+            getConditionalStyles().clear();
+            getConditionalStyles().addAll((Collection<? extends TextWidgetConditionalStyle>) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
@@ -305,6 +347,9 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
         case PropertiesPackage.TEXT_DESCRIPTION__STYLE:
             setStyle((TextWidgetStyle) null);
             return;
+        case PropertiesPackage.TEXT_DESCRIPTION__CONDITIONAL_STYLES:
+            getConditionalStyles().clear();
+            return;
         }
         super.eUnset(featureID);
     }
@@ -323,6 +368,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
             return initialOperation != null;
         case PropertiesPackage.TEXT_DESCRIPTION__STYLE:
             return style != null;
+        case PropertiesPackage.TEXT_DESCRIPTION__CONDITIONAL_STYLES:
+            return conditionalStyles != null && !conditionalStyles.isEmpty();
         }
         return super.eIsSet(featureID);
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextWidgetConditionalStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextWidgetConditionalStyleImpl.java
new file mode 100644
index 0000000000..c05a92c8ef
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextWidgetConditionalStyleImpl.java
@@ -0,0 +1,192 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.TextWidgetConditionalStyle;
+import org.eclipse.sirius.properties.TextWidgetStyle;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Text Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.TextWidgetConditionalStyleImpl#getStyle
+ * <em>Style</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TextWidgetConditionalStyleImpl extends WidgetConditionalStyleImpl implements TextWidgetConditionalStyle {
+    /**
+     * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @see #getStyle()
+     * @generated
+     * @ordered
+     */
+    protected TextWidgetStyle style;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected TextWidgetConditionalStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.TEXT_WIDGET_CONDITIONAL_STYLE;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public TextWidgetStyle getStyle() {
+        return style;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public NotificationChain basicSetStyle(TextWidgetStyle newStyle, NotificationChain msgs) {
+        TextWidgetStyle oldStyle = style;
+        style = newStyle;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_WIDGET_CONDITIONAL_STYLE__STYLE, oldStyle, newStyle);
+            if (msgs == null) {
+                msgs = notification;
+            } else {
+                msgs.add(notification);
+            }
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setStyle(TextWidgetStyle newStyle) {
+        if (newStyle != style) {
+            NotificationChain msgs = null;
+            if (style != null) {
+                msgs = ((InternalEObject) style).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.TEXT_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
+            }
+            if (newStyle != null) {
+                msgs = ((InternalEObject) newStyle).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.TEXT_WIDGET_CONDITIONAL_STYLE__STYLE, null, msgs);
+            }
+            msgs = basicSetStyle(newStyle, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_WIDGET_CONDITIONAL_STYLE__STYLE, newStyle, newStyle));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+        case PropertiesPackage.TEXT_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return basicSetStyle(null, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case PropertiesPackage.TEXT_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return getStyle();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case PropertiesPackage.TEXT_WIDGET_CONDITIONAL_STYLE__STYLE:
+            setStyle((TextWidgetStyle) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.TEXT_WIDGET_CONDITIONAL_STYLE__STYLE:
+            setStyle((TextWidgetStyle) null);
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.TEXT_WIDGET_CONDITIONAL_STYLE__STYLE:
+            return style != null;
+        }
+        return super.eIsSet(featureID);
+    }
+
+} // TextWidgetConditionalStyleImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetConditionalStyleImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetConditionalStyleImpl.java
new file mode 100644
index 0000000000..5689069b84
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetConditionalStyleImpl.java
@@ -0,0 +1,178 @@
+/**
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.WidgetConditionalStyle;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Widget Conditional Style</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.WidgetConditionalStyleImpl#getPreconditionExpression
+ * <em>Precondition Expression</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class WidgetConditionalStyleImpl extends MinimalEObjectImpl.Container implements WidgetConditionalStyle {
+    /**
+     * The default value of the '{@link #getPreconditionExpression()
+     * <em>Precondition Expression</em>}' attribute. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @see #getPreconditionExpression()
+     * @generated
+     * @ordered
+     */
+    protected static final String PRECONDITION_EXPRESSION_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getPreconditionExpression()
+     * <em>Precondition Expression</em>}' attribute. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     *
+     * @see #getPreconditionExpression()
+     * @generated
+     * @ordered
+     */
+    protected String preconditionExpression = WidgetConditionalStyleImpl.PRECONDITION_EXPRESSION_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected WidgetConditionalStyleImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.WIDGET_CONDITIONAL_STYLE;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public String getPreconditionExpression() {
+        return preconditionExpression;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void setPreconditionExpression(String newPreconditionExpression) {
+        String oldPreconditionExpression = preconditionExpression;
+        preconditionExpression = newPreconditionExpression;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION, oldPreconditionExpression, preconditionExpression));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case PropertiesPackage.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION:
+            return getPreconditionExpression();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case PropertiesPackage.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION:
+            setPreconditionExpression((String) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION:
+            setPreconditionExpression(WidgetConditionalStyleImpl.PRECONDITION_EXPRESSION_EDEFAULT);
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.WIDGET_CONDITIONAL_STYLE__PRECONDITION_EXPRESSION:
+            return WidgetConditionalStyleImpl.PRECONDITION_EXPRESSION_EDEFAULT == null ? preconditionExpression != null
+                    : !WidgetConditionalStyleImpl.PRECONDITION_EXPRESSION_EDEFAULT.equals(preconditionExpression);
+        }
+        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(" (preconditionExpression: ");
+        result.append(preconditionExpression);
+        result.append(')');
+        return result.toString();
+    }
+
+} // WidgetConditionalStyleImpl
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 4eda18e304..5758e92983 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
@@ -16,18 +16,23 @@ import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.ButtonWidgetConditionalStyle;
 import org.eclipse.sirius.properties.ButtonWidgetStyle;
 import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle;
 import org.eclipse.sirius.properties.CheckboxWidgetStyle;
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.CustomDescription;
 import org.eclipse.sirius.properties.CustomExpression;
 import org.eclipse.sirius.properties.CustomOperation;
+import org.eclipse.sirius.properties.CustomWidgetConditionalStyle;
+import org.eclipse.sirius.properties.CustomWidgetStyle;
 import org.eclipse.sirius.properties.DynamicMappingFor;
 import org.eclipse.sirius.properties.DynamicMappingIf;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.GroupValidationSetDescription;
 import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.LabelWidgetConditionalStyle;
 import org.eclipse.sirius.properties.LabelWidgetStyle;
 import org.eclipse.sirius.properties.MultipleReferencesDescription;
 import org.eclipse.sirius.properties.OperationDescription;
@@ -36,14 +41,18 @@ import org.eclipse.sirius.properties.PageValidationSetDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
 import org.eclipse.sirius.properties.RadioWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
 import org.eclipse.sirius.properties.SelectWidgetStyle;
 import org.eclipse.sirius.properties.SingleReferenceDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.TextWidgetConditionalStyle;
 import org.eclipse.sirius.properties.TextWidgetStyle;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
+import org.eclipse.sirius.properties.WidgetConditionalStyle;
 import org.eclipse.sirius.properties.WidgetDescription;
 import org.eclipse.sirius.properties.WidgetStyle;
 import org.eclipse.sirius.viewpoint.description.Extension;
@@ -256,6 +265,51 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
+        public Adapter caseCustomWidgetStyle(CustomWidgetStyle object) {
+            return createCustomWidgetStyleAdapter();
+        }
+
+        @Override
+        public Adapter caseWidgetConditionalStyle(WidgetConditionalStyle object) {
+            return createWidgetConditionalStyleAdapter();
+        }
+
+        @Override
+        public Adapter caseTextWidgetConditionalStyle(TextWidgetConditionalStyle object) {
+            return createTextWidgetConditionalStyleAdapter();
+        }
+
+        @Override
+        public Adapter caseLabelWidgetConditionalStyle(LabelWidgetConditionalStyle object) {
+            return createLabelWidgetConditionalStyleAdapter();
+        }
+
+        @Override
+        public Adapter caseCheckboxWidgetConditionalStyle(CheckboxWidgetConditionalStyle object) {
+            return createCheckboxWidgetConditionalStyleAdapter();
+        }
+
+        @Override
+        public Adapter caseRadioWidgetConditionalStyle(RadioWidgetConditionalStyle object) {
+            return createRadioWidgetConditionalStyleAdapter();
+        }
+
+        @Override
+        public Adapter caseButtonWidgetConditionalStyle(ButtonWidgetConditionalStyle object) {
+            return createButtonWidgetConditionalStyleAdapter();
+        }
+
+        @Override
+        public Adapter caseSelectWidgetConditionalStyle(SelectWidgetConditionalStyle object) {
+            return createSelectWidgetConditionalStyleAdapter();
+        }
+
+        @Override
+        public Adapter caseCustomWidgetConditionalStyle(CustomWidgetConditionalStyle object) {
+            return createCustomWidgetConditionalStyleAdapter();
+        }
+
+        @Override
         public Adapter caseExtension(Extension object) {
             return createExtensionAdapter();
         }
@@ -755,6 +809,150 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.CustomWidgetStyle
+     * <em>Custom 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.CustomWidgetStyle
+     * @generated
+     */
+    public Adapter createCustomWidgetStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.WidgetConditionalStyle
+     * <em>Widget Conditional Style</em>}'. <!-- begin-user-doc --> This default
+     * implementation returns null so that we can easily ignore cases; it's
+     * useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.properties.WidgetConditionalStyle
+     * @generated
+     */
+    public Adapter createWidgetConditionalStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.TextWidgetConditionalStyle
+     * <em>Text Widget Conditional Style</em>}'. <!-- begin-user-doc --> This
+     * default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases
+     * anyway. <!-- end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.properties.TextWidgetConditionalStyle
+     * @generated
+     */
+    public Adapter createTextWidgetConditionalStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.LabelWidgetConditionalStyle
+     * <em>Label Widget Conditional Style</em>}'. <!-- begin-user-doc --> This
+     * default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases
+     * anyway. <!-- end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.properties.LabelWidgetConditionalStyle
+     * @generated
+     */
+    public Adapter createLabelWidgetConditionalStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle
+     * <em>Checkbox Widget Conditional Style</em>}'. <!-- begin-user-doc -->
+     * This default implementation returns null so that we can easily ignore
+     * cases; it's useful to ignore a case when inheritance will catch all the
+     * cases anyway. <!-- end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle
+     * @generated
+     */
+    public Adapter createCheckboxWidgetConditionalStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.RadioWidgetConditionalStyle
+     * <em>Radio Widget Conditional Style</em>}'. <!-- begin-user-doc --> This
+     * default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases
+     * anyway. <!-- end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.properties.RadioWidgetConditionalStyle
+     * @generated
+     */
+    public Adapter createRadioWidgetConditionalStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.ButtonWidgetConditionalStyle
+     * <em>Button Widget Conditional Style</em>}'. <!-- begin-user-doc --> This
+     * default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases
+     * anyway. <!-- end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.properties.ButtonWidgetConditionalStyle
+     * @generated
+     */
+    public Adapter createButtonWidgetConditionalStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.SelectWidgetConditionalStyle
+     * <em>Select Widget Conditional Style</em>}'. <!-- begin-user-doc --> This
+     * default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases
+     * anyway. <!-- end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.properties.SelectWidgetConditionalStyle
+     * @generated
+     */
+    public Adapter createSelectWidgetConditionalStyleAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.CustomWidgetConditionalStyle
+     * <em>Custom Widget Conditional Style</em>}'. <!-- begin-user-doc --> This
+     * default implementation returns null so that we can easily ignore cases;
+     * it's useful to ignore a case when inheritance will catch all the cases
+     * anyway. <!-- end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.properties.CustomWidgetConditionalStyle
+     * @generated
+     */
+    public Adapter createCustomWidgetConditionalStyleAdapter() {
+        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
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 f21735c52a..0b3d042b9f 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
@@ -16,18 +16,23 @@ import java.util.List;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.ButtonWidgetConditionalStyle;
 import org.eclipse.sirius.properties.ButtonWidgetStyle;
 import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle;
 import org.eclipse.sirius.properties.CheckboxWidgetStyle;
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.CustomDescription;
 import org.eclipse.sirius.properties.CustomExpression;
 import org.eclipse.sirius.properties.CustomOperation;
+import org.eclipse.sirius.properties.CustomWidgetConditionalStyle;
+import org.eclipse.sirius.properties.CustomWidgetStyle;
 import org.eclipse.sirius.properties.DynamicMappingFor;
 import org.eclipse.sirius.properties.DynamicMappingIf;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.GroupValidationSetDescription;
 import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.LabelWidgetConditionalStyle;
 import org.eclipse.sirius.properties.LabelWidgetStyle;
 import org.eclipse.sirius.properties.MultipleReferencesDescription;
 import org.eclipse.sirius.properties.OperationDescription;
@@ -36,14 +41,18 @@ import org.eclipse.sirius.properties.PageValidationSetDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
 import org.eclipse.sirius.properties.RadioWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
 import org.eclipse.sirius.properties.SelectWidgetStyle;
 import org.eclipse.sirius.properties.SingleReferenceDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.TextWidgetConditionalStyle;
 import org.eclipse.sirius.properties.TextWidgetStyle;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
+import org.eclipse.sirius.properties.WidgetConditionalStyle;
 import org.eclipse.sirius.properties.WidgetDescription;
 import org.eclipse.sirius.properties.WidgetStyle;
 import org.eclipse.sirius.viewpoint.description.Extension;
@@ -423,6 +432,102 @@ public class PropertiesSwitch<T> {
             }
             return result;
         }
+        case PropertiesPackage.CUSTOM_WIDGET_STYLE: {
+            CustomWidgetStyle customWidgetStyle = (CustomWidgetStyle) theEObject;
+            T result = caseCustomWidgetStyle(customWidgetStyle);
+            if (result == null) {
+                result = caseWidgetStyle(customWidgetStyle);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.WIDGET_CONDITIONAL_STYLE: {
+            WidgetConditionalStyle widgetConditionalStyle = (WidgetConditionalStyle) theEObject;
+            T result = caseWidgetConditionalStyle(widgetConditionalStyle);
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.TEXT_WIDGET_CONDITIONAL_STYLE: {
+            TextWidgetConditionalStyle textWidgetConditionalStyle = (TextWidgetConditionalStyle) theEObject;
+            T result = caseTextWidgetConditionalStyle(textWidgetConditionalStyle);
+            if (result == null) {
+                result = caseWidgetConditionalStyle(textWidgetConditionalStyle);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.LABEL_WIDGET_CONDITIONAL_STYLE: {
+            LabelWidgetConditionalStyle labelWidgetConditionalStyle = (LabelWidgetConditionalStyle) theEObject;
+            T result = caseLabelWidgetConditionalStyle(labelWidgetConditionalStyle);
+            if (result == null) {
+                result = caseWidgetConditionalStyle(labelWidgetConditionalStyle);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.CHECKBOX_WIDGET_CONDITIONAL_STYLE: {
+            CheckboxWidgetConditionalStyle checkboxWidgetConditionalStyle = (CheckboxWidgetConditionalStyle) theEObject;
+            T result = caseCheckboxWidgetConditionalStyle(checkboxWidgetConditionalStyle);
+            if (result == null) {
+                result = caseWidgetConditionalStyle(checkboxWidgetConditionalStyle);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.RADIO_WIDGET_CONDITIONAL_STYLE: {
+            RadioWidgetConditionalStyle radioWidgetConditionalStyle = (RadioWidgetConditionalStyle) theEObject;
+            T result = caseRadioWidgetConditionalStyle(radioWidgetConditionalStyle);
+            if (result == null) {
+                result = caseWidgetConditionalStyle(radioWidgetConditionalStyle);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.BUTTON_WIDGET_CONDITIONAL_STYLE: {
+            ButtonWidgetConditionalStyle buttonWidgetConditionalStyle = (ButtonWidgetConditionalStyle) theEObject;
+            T result = caseButtonWidgetConditionalStyle(buttonWidgetConditionalStyle);
+            if (result == null) {
+                result = caseWidgetConditionalStyle(buttonWidgetConditionalStyle);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.SELECT_WIDGET_CONDITIONAL_STYLE: {
+            SelectWidgetConditionalStyle selectWidgetConditionalStyle = (SelectWidgetConditionalStyle) theEObject;
+            T result = caseSelectWidgetConditionalStyle(selectWidgetConditionalStyle);
+            if (result == null) {
+                result = caseWidgetConditionalStyle(selectWidgetConditionalStyle);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.CUSTOM_WIDGET_CONDITIONAL_STYLE: {
+            CustomWidgetConditionalStyle customWidgetConditionalStyle = (CustomWidgetConditionalStyle) theEObject;
+            T result = caseCustomWidgetConditionalStyle(customWidgetConditionalStyle);
+            if (result == null) {
+                result = caseWidgetConditionalStyle(customWidgetConditionalStyle);
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
         default:
             return defaultCase(theEObject);
         }
@@ -923,6 +1028,159 @@ public class PropertiesSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
+     * <em>Custom 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>Custom Widget Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseCustomWidgetStyle(CustomWidgetStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Widget Conditional Style</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Widget Conditional Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseWidgetConditionalStyle(WidgetConditionalStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Text Widget Conditional Style</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Text Widget Conditional Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseTextWidgetConditionalStyle(TextWidgetConditionalStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Label Widget Conditional Style</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Label Widget Conditional Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseLabelWidgetConditionalStyle(LabelWidgetConditionalStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Checkbox Widget Conditional Style</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Checkbox Widget Conditional Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseCheckboxWidgetConditionalStyle(CheckboxWidgetConditionalStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Radio Widget Conditional Style</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Radio Widget Conditional Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseRadioWidgetConditionalStyle(RadioWidgetConditionalStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Button Widget Conditional Style</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Button Widget Conditional Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseButtonWidgetConditionalStyle(ButtonWidgetConditionalStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Select Widget Conditional Style</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Select Widget Conditional Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseSelectWidgetConditionalStyle(SelectWidgetConditionalStyle object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Custom Widget Conditional Style</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Custom Widget Conditional Style</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseCustomWidgetConditionalStyle(CustomWidgetConditionalStyle 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 -->
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 3873c3904b..95e71daab3 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
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.ui.properties.internal.tabprovider;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -17,26 +18,34 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import org.eclipse.eef.EEFButtonConditionalStyle;
 import org.eclipse.eef.EEFButtonDescription;
 import org.eclipse.eef.EEFButtonStyle;
+import org.eclipse.eef.EEFCheckboxConditionalStyle;
 import org.eclipse.eef.EEFCheckboxDescription;
 import org.eclipse.eef.EEFCheckboxStyle;
 import org.eclipse.eef.EEFContainerDescription;
 import org.eclipse.eef.EEFCustomExpression;
+import org.eclipse.eef.EEFCustomWidgetConditionalStyle;
 import org.eclipse.eef.EEFCustomWidgetDescription;
+import org.eclipse.eef.EEFCustomWidgetStyle;
 import org.eclipse.eef.EEFDynamicMappingFor;
 import org.eclipse.eef.EEFDynamicMappingIf;
 import org.eclipse.eef.EEFGroupDescription;
+import org.eclipse.eef.EEFLabelConditionalStyle;
 import org.eclipse.eef.EEFLabelDescription;
 import org.eclipse.eef.EEFLabelStyle;
 import org.eclipse.eef.EEFPageDescription;
 import org.eclipse.eef.EEFPropertyValidationRuleDescription;
+import org.eclipse.eef.EEFRadioConditionalStyle;
 import org.eclipse.eef.EEFRadioDescription;
 import org.eclipse.eef.EEFRadioStyle;
 import org.eclipse.eef.EEFRuleAuditDescription;
+import org.eclipse.eef.EEFSelectConditionalStyle;
 import org.eclipse.eef.EEFSelectDescription;
 import org.eclipse.eef.EEFSelectStyle;
 import org.eclipse.eef.EEFSemanticValidationRuleDescription;
+import org.eclipse.eef.EEFTextConditionalStyle;
 import org.eclipse.eef.EEFTextDescription;
 import org.eclipse.eef.EEFTextStyle;
 import org.eclipse.eef.EEFValidationFixDescription;
@@ -51,25 +60,33 @@ 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.ButtonWidgetConditionalStyle;
 import org.eclipse.sirius.properties.ButtonWidgetStyle;
 import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle;
 import org.eclipse.sirius.properties.CheckboxWidgetStyle;
 import org.eclipse.sirius.properties.CustomDescription;
 import org.eclipse.sirius.properties.CustomExpression;
 import org.eclipse.sirius.properties.CustomOperation;
+import org.eclipse.sirius.properties.CustomWidgetConditionalStyle;
+import org.eclipse.sirius.properties.CustomWidgetStyle;
 import org.eclipse.sirius.properties.DynamicMappingFor;
 import org.eclipse.sirius.properties.DynamicMappingIf;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.LabelWidgetConditionalStyle;
 import org.eclipse.sirius.properties.LabelWidgetStyle;
 import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.PropertyValidationRule;
 import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
 import org.eclipse.sirius.properties.RadioWidgetStyle;
 import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
 import org.eclipse.sirius.properties.SelectWidgetStyle;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.TextWidgetConditionalStyle;
 import org.eclipse.sirius.properties.TextWidgetStyle;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 import org.eclipse.sirius.properties.WidgetDescription;
@@ -348,6 +365,8 @@ public class ViewDescriptionConverter {
 
         if (widgetStyle instanceof TextWidgetStyle) {
             eefWidgetStyle = createEEFTextStyle((TextWidgetStyle) widgetStyle);
+        } else if (widgetStyle instanceof LabelWidgetStyle) {
+            eefWidgetStyle = createEEFLabelStyle((LabelWidgetStyle) widgetStyle);
         } else if (widgetStyle instanceof ButtonWidgetStyle) {
             eefWidgetStyle = EefFactory.eINSTANCE.createEEFButtonStyle();
         } else if (widgetStyle instanceof CheckboxWidgetStyle) {
@@ -356,6 +375,8 @@ public class ViewDescriptionConverter {
             eefWidgetStyle = EefFactory.eINSTANCE.createEEFRadioStyle();
         } else if (widgetStyle instanceof SelectWidgetStyle) {
             eefWidgetStyle = EefFactory.eINSTANCE.createEEFSelectStyle();
+        } else if (widgetStyle instanceof CustomWidgetStyle) {
+            eefWidgetStyle = EefFactory.eINSTANCE.createEEFCustomWidgetStyle();
         }
 
         // Set label style
@@ -453,6 +474,21 @@ public class ViewDescriptionConverter {
         if (textStyle != null) {
             eefTextDescription.setStyle((EEFTextStyle) createEEFWidgetStyle(textStyle));
         }
+
+        List<TextWidgetConditionalStyle> conditionalStyles = textDescription.getConditionalStyles();
+        if (conditionalStyles != null && !conditionalStyles.isEmpty()) {
+            List<EEFTextConditionalStyle> eefConditionalStyles = new ArrayList<EEFTextConditionalStyle>();
+            for (TextWidgetConditionalStyle conditionalStyle : conditionalStyles) {
+                EEFTextConditionalStyle eefConditionalStyle = EefFactory.eINSTANCE.createEEFTextConditionalStyle();
+                eefConditionalStyle.setPreconditionExpression(conditionalStyle.getPreconditionExpression());
+                eefConditionalStyle.setStyle((EEFTextStyle) createEEFWidgetStyle(conditionalStyle.getStyle()));
+                eefConditionalStyles.add(eefConditionalStyle);
+            }
+
+            if (eefConditionalStyles != null && !eefConditionalStyles.isEmpty()) {
+                eefTextDescription.getConditionalStyles().addAll(eefConditionalStyles);
+            }
+        }
         return eefTextDescription;
     }
 
@@ -509,9 +545,22 @@ public class ViewDescriptionConverter {
         eefLabelDescription.setBodyExpression(labelDescription.getBodyExpression());
         LabelWidgetStyle bodyStyle = labelDescription.getStyle();
         if (bodyStyle != null) {
-            EEFLabelStyle eefLabelStyle = createEEFLabelStyle(bodyStyle);
-            eefLabelDescription.setStyle(eefLabelStyle);
+            eefLabelDescription.setStyle((EEFLabelStyle) createEEFWidgetStyle(bodyStyle));
+        }
+
+        List<LabelWidgetConditionalStyle> conditionalStyles = labelDescription.getConditionalStyles();
+        if (conditionalStyles != null && !conditionalStyles.isEmpty()) {
+            List<EEFLabelConditionalStyle> eefConditionalStyles = new ArrayList<EEFLabelConditionalStyle>();
+            for (LabelWidgetConditionalStyle conditionalStyle : conditionalStyles) {
+                EEFLabelConditionalStyle eefConditionalStyle = EefFactory.eINSTANCE.createEEFLabelConditionalStyle();
+                eefConditionalStyle.setPreconditionExpression(conditionalStyle.getPreconditionExpression());
+                eefConditionalStyle.setStyle((EEFLabelStyle) createEEFWidgetStyle(conditionalStyle.getStyle()));
+                eefConditionalStyles.add(eefConditionalStyle);
+            }
 
+            if (eefConditionalStyles != null && !eefConditionalStyles.isEmpty()) {
+                eefLabelDescription.getConditionalStyles().addAll(eefConditionalStyles);
+            }
         }
 
         return eefLabelDescription;
@@ -530,6 +579,21 @@ public class ViewDescriptionConverter {
             eefButtonDescription.setStyle((EEFButtonStyle) createEEFWidgetStyle(buttonStyle));
         }
 
+        List<ButtonWidgetConditionalStyle> conditionalStyles = buttonDescription.getConditionalStyles();
+        if (conditionalStyles != null && !conditionalStyles.isEmpty()) {
+            List<EEFButtonConditionalStyle> eefConditionalStyles = new ArrayList<EEFButtonConditionalStyle>();
+            for (ButtonWidgetConditionalStyle conditionalStyle : conditionalStyles) {
+                EEFButtonConditionalStyle eefConditionalStyle = EefFactory.eINSTANCE.createEEFButtonConditionalStyle();
+                eefConditionalStyle.setPreconditionExpression(conditionalStyle.getPreconditionExpression());
+                eefConditionalStyle.setStyle((EEFButtonStyle) createEEFWidgetStyle(conditionalStyle.getStyle()));
+                eefConditionalStyles.add(eefConditionalStyle);
+            }
+
+            if (eefConditionalStyles != null && !eefConditionalStyles.isEmpty()) {
+                eefButtonDescription.getConditionalStyles().addAll(eefConditionalStyles);
+            }
+        }
+
         return eefButtonDescription;
     }
 
@@ -544,6 +608,21 @@ public class ViewDescriptionConverter {
             eefCheckboxDescription.setStyle((EEFCheckboxStyle) createEEFWidgetStyle(checkboxStyle));
         }
 
+        List<CheckboxWidgetConditionalStyle> conditionalStyles = checkboxDescription.getConditionalStyles();
+        if (conditionalStyles != null && !conditionalStyles.isEmpty()) {
+            List<EEFCheckboxConditionalStyle> eefConditionalStyles = new ArrayList<EEFCheckboxConditionalStyle>();
+            for (CheckboxWidgetConditionalStyle conditionalStyle : conditionalStyles) {
+                EEFCheckboxConditionalStyle eefConditionalStyle = EefFactory.eINSTANCE.createEEFCheckboxConditionalStyle();
+                eefConditionalStyle.setPreconditionExpression(conditionalStyle.getPreconditionExpression());
+                eefConditionalStyle.setStyle((EEFCheckboxStyle) createEEFWidgetStyle(conditionalStyle.getStyle()));
+                eefConditionalStyles.add(eefConditionalStyle);
+            }
+
+            if (eefConditionalStyles != null && !eefConditionalStyles.isEmpty()) {
+                eefCheckboxDescription.getConditionalStyles().addAll(eefConditionalStyles);
+            }
+        }
+
         return eefCheckboxDescription;
     }
 
@@ -560,6 +639,21 @@ public class ViewDescriptionConverter {
             eefSelectDescription.setStyle((EEFSelectStyle) createEEFWidgetStyle(selectStyle));
         }
 
+        List<SelectWidgetConditionalStyle> conditionalStyles = selectDescription.getConditionalStyles();
+        if (conditionalStyles != null) {
+            List<EEFSelectConditionalStyle> eefConditionalStyles = new ArrayList<EEFSelectConditionalStyle>();
+            for (SelectWidgetConditionalStyle conditionalStyle : conditionalStyles) {
+                EEFSelectConditionalStyle eefConditionalStyle = EefFactory.eINSTANCE.createEEFSelectConditionalStyle();
+                eefConditionalStyle.setPreconditionExpression(conditionalStyle.getPreconditionExpression());
+                eefConditionalStyle.setStyle((EEFSelectStyle) createEEFWidgetStyle(conditionalStyle.getStyle()));
+                eefConditionalStyles.add(eefConditionalStyle);
+            }
+
+            if (eefConditionalStyles != null && !eefConditionalStyles.isEmpty()) {
+                eefSelectDescription.getConditionalStyles().addAll(eefConditionalStyles);
+            }
+        }
+
         return eefSelectDescription;
     }
 
@@ -576,6 +670,21 @@ public class ViewDescriptionConverter {
             eefRadioDescription.setStyle((EEFRadioStyle) createEEFWidgetStyle(radioStyle));
         }
 
+        List<RadioWidgetConditionalStyle> conditionalStyles = radioDescription.getConditionalStyles();
+        if (conditionalStyles != null && !conditionalStyles.isEmpty()) {
+            List<EEFRadioConditionalStyle> eefConditionalStyles = new ArrayList<EEFRadioConditionalStyle>();
+            for (RadioWidgetConditionalStyle conditionalStyle : conditionalStyles) {
+                EEFRadioConditionalStyle eefConditionalStyle = EefFactory.eINSTANCE.createEEFRadioConditionalStyle();
+                eefConditionalStyle.setPreconditionExpression(conditionalStyle.getPreconditionExpression());
+                eefConditionalStyle.setStyle((EEFRadioStyle) createEEFWidgetStyle(conditionalStyle.getStyle()));
+                eefConditionalStyles.add(eefConditionalStyle);
+            }
+
+            if (eefConditionalStyles != null && !eefConditionalStyles.isEmpty()) {
+                eefRadioDescription.getConditionalStyles().addAll(eefConditionalStyles);
+            }
+        }
+
         return eefRadioDescription;
     }
 
@@ -598,6 +707,26 @@ public class ViewDescriptionConverter {
             eefCustomExpression.setCustomExpression(getExpressionForOperation(customOperation.getInitialOperation()));
             eefCustomDescription.getCustomExpressions().add(eefCustomExpression);
         }
+
+        CustomWidgetStyle customStyle = customDescription.getStyle();
+        if (customStyle != null) {
+            eefCustomDescription.setStyle((EEFCustomWidgetStyle) createEEFWidgetStyle(customStyle));
+        }
+
+        List<CustomWidgetConditionalStyle> conditionalStyles = customDescription.getConditionalStyles();
+        if (conditionalStyles != null && !conditionalStyles.isEmpty()) {
+            List<EEFCustomWidgetConditionalStyle> eefConditionalStyles = new ArrayList<EEFCustomWidgetConditionalStyle>();
+            for (CustomWidgetConditionalStyle conditionalStyle : conditionalStyles) {
+                EEFCustomWidgetConditionalStyle eefConditionalStyle = EefFactory.eINSTANCE.createEEFCustomWidgetConditionalStyle();
+                eefConditionalStyle.setPreconditionExpression(conditionalStyle.getPreconditionExpression());
+                eefConditionalStyle.setStyle((EEFCustomWidgetStyle) createEEFWidgetStyle(conditionalStyle.getStyle()));
+                eefConditionalStyles.add(eefConditionalStyle);
+            }
+
+            if (eefConditionalStyles != null && !eefConditionalStyles.isEmpty()) {
+                eefCustomDescription.getConditionalStyles().addAll(eefConditionalStyles);
+            }
+        }
         return eefCustomDescription;
     }
 }