[509288] Remove manual code from the generated code

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

113 files changed, 3602 insertions, 507 deletions

diff --git a/plugins/org.eclipse.sirius.properties.edit/.classpath b/plugins/org.eclipse.sirius.properties.edit/.classpath
index 75556083f6..9ac12f1fdc 100644
--- a/plugins/org.eclipse.sirius.properties.edit/.classpath
+++ b/plugins/org.eclipse.sirius.properties.edit/.classpath
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="src" path="src-generator"/>
+	<classpathentry kind="src" path="src-spec"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.sirius.properties.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.properties.edit/.settings/org.eclipse.jdt.core.prefs
index 1a45a66fa2..f5a81dd8ae 100644
--- a/plugins/org.eclipse.sirius.properties.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.sirius.properties.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,15 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.7
@@ -9,12 +19,15 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -22,33 +35,54 @@ org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
@@ -56,14 +90,17 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.7
diff --git a/plugins/org.eclipse.sirius.properties.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.properties.edit/META-INF/MANIFEST.MF
index eb3a1cf092..2383a11889 100644
--- a/plugins/org.eclipse.sirius.properties.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.properties.edit/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Bundle-Activator: org.eclipse.sirius.properties.provider.PropertiesEditPlugin$Im
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: org.eclipse.sirius.properties.provider;version="4.1.0"
+Export-Package: org.eclipse.sirius.properties.edit.internal.generator;version="4.1.0",
+ org.eclipse.sirius.properties.provider;version="4.1.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0",
  org.eclipse.sirius.properties;bundle-version="4.1.0";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="2.11.0";visibility:=reexport,
diff --git a/plugins/org.eclipse.sirius.properties.edit/build.properties b/plugins/org.eclipse.sirius.properties.edit/build.properties
index cfd9c33801..4e61ea6668 100644
--- a/plugins/org.eclipse.sirius.properties.edit/build.properties
+++ b/plugins/org.eclipse.sirius.properties.edit/build.properties
@@ -16,7 +16,9 @@ bin.includes = .,\
                plugin.properties,\
                about.html
 jars.compile.order = .
-source.. = src-gen/
+source.. = src-gen/,\
+           src-generator/,\
+           src-spec/
 output.. = bin/
 javacDefaultEncoding.. = US-ASCII
 javacProjectSettings = true
diff --git a/plugins/org.eclipse.sirius.properties.edit/plugin.xml b/plugins/org.eclipse.sirius.properties.edit/plugin.xml
index 819276b526..515882a4c1 100644
--- a/plugins/org.eclipse.sirius.properties.edit/plugin.xml
+++ b/plugins/org.eclipse.sirius.properties.edit/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.0"?>
 
 <!--
- Copyright (c) 2015 Obeo.
+ 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
@@ -16,10 +16,10 @@
 <plugin>
 
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated properties -->
+      <!-- @generated NOT properties -->
       <factory
             uri="http://www.eclipse.org/sirius/properties/1.0.0"
-            class="org.eclipse.sirius.properties.provider.PropertiesItemProviderAdapterFactory"
+            class="org.eclipse.sirius.properties.provider.PropertiesItemProviderAdapterFactorySpec"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
                org.eclipse.emf.edit.provider.IStructuredItemContentProvider
@@ -29,13 +29,13 @@
    </extension>
 
    <extension point="org.eclipse.emf.edit.childCreationExtenders">
-      <!-- @generated properties -->
+      <!-- @generated NOT properties -->
       <extender
             uri="http://www.eclipse.org/sirius/description/1.1.0"
-            class="org.eclipse.sirius.properties.provider.PropertiesItemProviderAdapterFactory$DescriptionChildCreationExtender"/>
+            class="org.eclipse.sirius.properties.provider.DescriptionChildCreationExtenderSpec"/>
       <extender
             uri="http://www.eclipse.org/sirius/description/validation/1.1.0"
-            class="org.eclipse.sirius.properties.provider.PropertiesItemProviderAdapterFactory$ValidationChildCreationExtender"/>
+            class="org.eclipse.sirius.properties.provider.ValidationChildCreationExtenderSpec"/>
    </extension>
 
 </plugin>
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
index 1d073fdb48..d87fff55e7 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.properties.ButtonDescription;
-import org.eclipse.sirius.properties.ButtonWidgetConditionalStyle;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
@@ -64,7 +63,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This adds a property descriptor for the Button Label Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addButtonLabelExpressionPropertyDescriptor(Object object) {
@@ -81,7 +80,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
      * {@link org.eclipse.emf.edit.command.RemoveCommand} or
      * {@link org.eclipse.emf.edit.command.MoveCommand} in
      * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -97,7 +96,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -112,7 +111,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns ButtonDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -123,14 +122,14 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((ButtonDescription) object).getLabelExpression();
+        String label = ((ButtonDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_ButtonDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_ButtonDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -138,7 +137,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -163,7 +162,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated NOT
+     * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
@@ -173,9 +172,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.BUTTON_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createButtonWidgetStyle()));
 
-        ButtonWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createButtonWidgetConditionalStyle();
-        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createButtonWidgetStyle());
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.BUTTON_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.BUTTON_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createButtonWidgetConditionalStyle()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonWidgetConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonWidgetConditionalStyleItemProvider.java
index d57c0a92f7..3d343ec5b2 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonWidgetConditionalStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonWidgetConditionalStyleItemProvider.java
@@ -27,7 +27,7 @@ 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 {
@@ -63,7 +63,7 @@ public class ButtonWidgetConditionalStyleItemProvider extends WidgetConditionalS
      * {@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
@@ -77,7 +77,7 @@ public class ButtonWidgetConditionalStyleItemProvider extends WidgetConditionalS
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -92,7 +92,7 @@ public class ButtonWidgetConditionalStyleItemProvider extends WidgetConditionalS
     /**
      * This returns ButtonWidgetConditionalStyle.gif. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -103,14 +103,14 @@ public class ButtonWidgetConditionalStyleItemProvider extends WidgetConditionalS
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((ButtonWidgetConditionalStyle) object).getPreconditionExpression();
         return label == null || label.length() == 0 ? getString("_UI_ButtonWidgetConditionalStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_ButtonWidgetConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -118,7 +118,7 @@ public class ButtonWidgetConditionalStyleItemProvider extends WidgetConditionalS
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonWidgetStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonWidgetStyleItemProvider.java
index 967cc0f4c2..5c13c35126 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonWidgetStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonWidgetStyleItemProvider.java
@@ -55,7 +55,7 @@ public class ButtonWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns ButtonWidgetStyle.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -66,14 +66,14 @@ public class ButtonWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((ButtonWidgetStyle) object).getLabelFontNameExpression();
         return label == null || label.length() == 0 ? getString("_UI_ButtonWidgetStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_ButtonWidgetStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -81,7 +81,7 @@ public class ButtonWidgetStyleItemProvider extends WidgetStyleItemProvider {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
index 1163f87d85..f8aca5f7b8 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.properties.CheckboxDescription;
-import org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
@@ -81,7 +80,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
      * {@link org.eclipse.emf.edit.command.RemoveCommand} or
      * {@link org.eclipse.emf.edit.command.MoveCommand} in
      * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -97,7 +96,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -112,7 +111,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
     /**
      * This returns CheckboxDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -123,14 +122,14 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((CheckboxDescription) object).getLabelExpression();
+        String label = ((CheckboxDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_CheckboxDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_CheckboxDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -138,7 +137,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -163,7 +162,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated NOT
+     * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
@@ -173,9 +172,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createCheckboxWidgetStyle()));
 
-        CheckboxWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createCheckboxWidgetConditionalStyle();
-        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createCheckboxWidgetStyle());
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createCheckboxWidgetConditionalStyle()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxWidgetConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxWidgetConditionalStyleItemProvider.java
index 21f0777f55..8317cf8dad 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxWidgetConditionalStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxWidgetConditionalStyleItemProvider.java
@@ -27,7 +27,7 @@ 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 {
@@ -63,7 +63,7 @@ public class CheckboxWidgetConditionalStyleItemProvider extends WidgetConditiona
      * {@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
@@ -77,7 +77,7 @@ public class CheckboxWidgetConditionalStyleItemProvider extends WidgetConditiona
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -92,7 +92,7 @@ public class CheckboxWidgetConditionalStyleItemProvider extends WidgetConditiona
     /**
      * This returns CheckboxWidgetConditionalStyle.gif. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -103,14 +103,14 @@ public class CheckboxWidgetConditionalStyleItemProvider extends WidgetConditiona
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((CheckboxWidgetConditionalStyle) object).getPreconditionExpression();
         return label == null || label.length() == 0 ? getString("_UI_CheckboxWidgetConditionalStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_CheckboxWidgetConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -118,7 +118,7 @@ public class CheckboxWidgetConditionalStyleItemProvider extends WidgetConditiona
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxWidgetStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxWidgetStyleItemProvider.java
index c2e082ad89..fb9d5f7214 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxWidgetStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxWidgetStyleItemProvider.java
@@ -55,7 +55,7 @@ public class CheckboxWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns CheckboxWidgetStyle.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -66,14 +66,14 @@ public class CheckboxWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((CheckboxWidgetStyle) object).getLabelFontNameExpression();
         return label == null || label.length() == 0 ? getString("_UI_CheckboxWidgetStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_CheckboxWidgetStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -81,7 +81,7 @@ public class CheckboxWidgetStyleItemProvider extends WidgetStyleItemProvider {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
index bef893443a..b21abbecfd 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
@@ -20,7 +20,6 @@ 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.ContainerDescription;
-import org.eclipse.sirius.properties.DynamicMappingFor;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
@@ -64,7 +63,7 @@ public class ContainerDescriptionItemProvider extends ControlDescriptionItemProv
      * {@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
@@ -79,7 +78,7 @@ public class ContainerDescriptionItemProvider extends ControlDescriptionItemProv
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -94,7 +93,7 @@ public class ContainerDescriptionItemProvider extends ControlDescriptionItemProv
     /**
      * This returns ContainerDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -105,14 +104,14 @@ public class ContainerDescriptionItemProvider extends ControlDescriptionItemProv
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((ContainerDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_ContainerDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_ContainerDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -120,7 +119,7 @@ public class ContainerDescriptionItemProvider extends ControlDescriptionItemProv
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -141,7 +140,7 @@ public class ContainerDescriptionItemProvider extends ControlDescriptionItemProv
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated NOT
+     * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
@@ -159,9 +158,7 @@ public class ContainerDescriptionItemProvider extends ControlDescriptionItemProv
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createSelectDescription()));
 
-        DynamicMappingFor dynamicFor = PropertiesFactory.eINSTANCE.createDynamicMappingFor();
-        dynamicFor.getIfs().add(PropertiesFactory.eINSTANCE.createDynamicMappingIf());
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, dynamicFor));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createDynamicMappingFor()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createTextAreaDescription()));
 
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ControlDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ControlDescriptionItemProvider.java
index fd188cd6de..ec496c6874 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ControlDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ControlDescriptionItemProvider.java
@@ -82,14 +82,14 @@ public class ControlDescriptionItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((ControlDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_ControlDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_ControlDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -97,7 +97,7 @@ public class ControlDescriptionItemProvider extends ItemProviderAdapter
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomDescriptionItemProvider.java
index f005550388..255ccf2242 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomDescriptionItemProvider.java
@@ -20,7 +20,6 @@ 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.CustomDescription;
-import org.eclipse.sirius.properties.CustomWidgetConditionalStyle;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
@@ -64,7 +63,7 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
      * {@link org.eclipse.emf.edit.command.RemoveCommand} or
      * {@link org.eclipse.emf.edit.command.MoveCommand} in
      * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -81,7 +80,7 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -96,7 +95,7 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns CustomDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -107,14 +106,14 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((CustomDescription) object).getLabelExpression();
+        String label = ((CustomDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_CustomDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_CustomDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -122,7 +121,7 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -145,7 +144,7 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated NOT
+     * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
@@ -157,9 +156,7 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CUSTOM_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createCustomWidgetStyle()));
 
-        CustomWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createCustomWidgetConditionalStyle();
-        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createCustomWidgetStyle());
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CUSTOM_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CUSTOM_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createCustomWidgetConditionalStyle()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java
index d8816347de..d7b2b81697 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomExpressionItemProvider.java
@@ -96,7 +96,7 @@ public class CustomExpressionItemProvider extends ItemProviderAdapter
     /**
      * This returns CustomExpression.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -107,14 +107,14 @@ public class CustomExpressionItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((CustomExpression) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_CustomExpression_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_CustomExpression_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -122,7 +122,7 @@ public class CustomExpressionItemProvider extends ItemProviderAdapter
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java
index e187a566c9..43b44af0fa 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomOperationItemProvider.java
@@ -88,7 +88,7 @@ public class CustomOperationItemProvider extends ItemProviderAdapter
      * {@link org.eclipse.emf.edit.command.RemoveCommand} or
      * {@link org.eclipse.emf.edit.command.MoveCommand} in
      * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -102,7 +102,7 @@ public class CustomOperationItemProvider extends ItemProviderAdapter
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -117,7 +117,7 @@ public class CustomOperationItemProvider extends ItemProviderAdapter
     /**
      * This returns CustomOperation.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -128,14 +128,14 @@ public class CustomOperationItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((CustomOperation) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_CustomOperation_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_CustomOperation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -143,7 +143,7 @@ public class CustomOperationItemProvider extends ItemProviderAdapter
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomWidgetConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomWidgetConditionalStyleItemProvider.java
index 7fb93c793b..8e30a8f384 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomWidgetConditionalStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomWidgetConditionalStyleItemProvider.java
@@ -27,7 +27,7 @@ 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 {
@@ -63,7 +63,7 @@ public class CustomWidgetConditionalStyleItemProvider extends WidgetConditionalS
      * {@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
@@ -77,7 +77,7 @@ public class CustomWidgetConditionalStyleItemProvider extends WidgetConditionalS
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -92,7 +92,7 @@ public class CustomWidgetConditionalStyleItemProvider extends WidgetConditionalS
     /**
      * This returns CustomWidgetConditionalStyle.gif. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -103,14 +103,14 @@ public class CustomWidgetConditionalStyleItemProvider extends WidgetConditionalS
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((CustomWidgetConditionalStyle) object).getPreconditionExpression();
         return label == null || label.length() == 0 ? getString("_UI_CustomWidgetConditionalStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_CustomWidgetConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -118,7 +118,7 @@ public class CustomWidgetConditionalStyleItemProvider extends WidgetConditionalS
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomWidgetStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomWidgetStyleItemProvider.java
index 402c333c28..c1742dcc4a 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomWidgetStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomWidgetStyleItemProvider.java
@@ -55,7 +55,7 @@ public class CustomWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns CustomWidgetStyle.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -66,14 +66,14 @@ public class CustomWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((CustomWidgetStyle) object).getLabelFontNameExpression();
         return label == null || label.length() == 0 ? getString("_UI_CustomWidgetStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_CustomWidgetStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -81,7 +81,7 @@ public class CustomWidgetStyleItemProvider extends WidgetStyleItemProvider {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
index d61e7a2ace..579ca268b5 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
@@ -11,7 +11,6 @@
  */
 package org.eclipse.sirius.properties.provider;
 
-import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.List;
 
@@ -94,7 +93,7 @@ public class DynamicMappingForItemProvider extends ControlDescriptionItemProvide
      * {@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
@@ -108,7 +107,7 @@ public class DynamicMappingForItemProvider extends ControlDescriptionItemProvide
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -123,7 +122,7 @@ public class DynamicMappingForItemProvider extends ControlDescriptionItemProvide
     /**
      * This returns DynamicMappingFor.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -134,15 +133,14 @@ public class DynamicMappingForItemProvider extends ControlDescriptionItemProvide
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
-        DynamicMappingFor element = (DynamicMappingFor) object;
-        String label = MessageFormat.format("for {0} in {1}", element.getIterator(), element.getIterableExpression()); //$NON-NLS-1$
+        String label = ((DynamicMappingFor) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_DynamicMappingFor_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_DynamicMappingFor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -150,7 +148,7 @@ public class DynamicMappingForItemProvider extends ControlDescriptionItemProvide
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java
index b2c24739e0..cbfedb92e7 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProvider.java
@@ -71,7 +71,7 @@ public class DynamicMappingIfItemProvider extends ItemProviderAdapter
     /**
      * This adds a property descriptor for the Predicate Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addPredicateExpressionPropertyDescriptor(Object object) {
@@ -88,7 +88,7 @@ public class DynamicMappingIfItemProvider extends ItemProviderAdapter
      * {@link org.eclipse.emf.edit.command.RemoveCommand} or
      * {@link org.eclipse.emf.edit.command.MoveCommand} in
      * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -102,7 +102,7 @@ public class DynamicMappingIfItemProvider extends ItemProviderAdapter
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -117,7 +117,7 @@ public class DynamicMappingIfItemProvider extends ItemProviderAdapter
     /**
      * This returns DynamicMappingIf.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -128,14 +128,14 @@ public class DynamicMappingIfItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((DynamicMappingIf) object).getPredicateExpression();
         return label == null || label.length() == 0 ? getString("_UI_DynamicMappingIf_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_DynamicMappingIf_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -143,7 +143,7 @@ public class DynamicMappingIfItemProvider extends ItemProviderAdapter
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/EditSupportItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/EditSupportItemProvider.java
index 40ea151140..7de975a760 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/EditSupportItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/EditSupportItemProvider.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.EditSupport} object. <!-- begin-user-doc
  * --> <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class EditSupportItemProvider extends ItemProviderAdapter
@@ -74,7 +74,7 @@ public class EditSupportItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -87,7 +87,7 @@ public class EditSupportItemProvider extends ItemProviderAdapter
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/FillLayoutDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/FillLayoutDescriptionItemProvider.java
index b6305876a6..5dec3bec28 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/FillLayoutDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/FillLayoutDescriptionItemProvider.java
@@ -74,31 +74,26 @@ public class FillLayoutDescriptionItemProvider extends LayoutDescriptionItemProv
     /**
      * This returns FillLayoutDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public Object getImage(Object object) {
-        FILL_LAYOUT_ORIENTATION labelValue = ((FillLayoutDescription) object).getOrientation();
-        if (labelValue == FILL_LAYOUT_ORIENTATION.HORIZONTAL) {
-            return overlayImage(object, getResourceLocator().getImage("full/obj16/FillLayoutDescriptionHorizontal")); //$NON-NLS-1$
-        } else {
-            return overlayImage(object, getResourceLocator().getImage("full/obj16/FillLayoutDescriptionVertical")); //$NON-NLS-1$
-        }
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/FillLayoutDescription")); //$NON-NLS-1$
     }
 
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         FILL_LAYOUT_ORIENTATION labelValue = ((FillLayoutDescription) object).getOrientation();
         String label = labelValue == null ? null : labelValue.toString();
         return label == null || label.length() == 0 ? getString("_UI_FillLayoutDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_FillLayoutDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -106,7 +101,7 @@ public class FillLayoutDescriptionItemProvider extends LayoutDescriptionItemProv
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GridLayoutDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GridLayoutDescriptionItemProvider.java
index bd8518d563..107da81bc1 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GridLayoutDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GridLayoutDescriptionItemProvider.java
@@ -74,7 +74,7 @@ public class GridLayoutDescriptionItemProvider extends LayoutDescriptionItemProv
     /**
      * This adds a property descriptor for the Make Columns With Equal Width
      * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addMakeColumnsWithEqualWidthPropertyDescriptor(Object object) {
@@ -87,7 +87,7 @@ public class GridLayoutDescriptionItemProvider extends LayoutDescriptionItemProv
     /**
      * This returns GridLayoutDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -98,7 +98,7 @@ public class GridLayoutDescriptionItemProvider extends LayoutDescriptionItemProv
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -112,7 +112,7 @@ public class GridLayoutDescriptionItemProvider extends LayoutDescriptionItemProv
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupConditionalStyleItemProvider.java
index 520ed04b60..acb783e942 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupConditionalStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupConditionalStyleItemProvider.java
@@ -63,7 +63,7 @@ public class GroupConditionalStyleItemProvider extends WidgetConditionalStyleIte
      * {@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
@@ -77,7 +77,7 @@ public class GroupConditionalStyleItemProvider extends WidgetConditionalStyleIte
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -92,7 +92,7 @@ public class GroupConditionalStyleItemProvider extends WidgetConditionalStyleIte
     /**
      * This returns GroupConditionalStyle.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -103,14 +103,14 @@ public class GroupConditionalStyleItemProvider extends WidgetConditionalStyleIte
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((GroupConditionalStyle) object).getPreconditionExpression();
         return label == null || label.length() == 0 ? getString("_UI_GroupConditionalStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_GroupConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -118,7 +118,7 @@ public class GroupConditionalStyleItemProvider extends WidgetConditionalStyleIte
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
index c999e70f7e..19fe9d0a09 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
@@ -30,8 +30,6 @@ 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.DynamicMappingFor;
-import org.eclipse.sirius.properties.GroupConditionalStyle;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
@@ -117,7 +115,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter
     /**
      * This adds a property descriptor for the Semantic Candidate Expression
      * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addSemanticCandidateExpressionPropertyDescriptor(Object object) {
@@ -130,7 +128,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter
     /**
      * This adds a property descriptor for the Precondition Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addPreconditionExpressionPropertyDescriptor(Object object) {
@@ -147,7 +145,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter
      * {@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
@@ -164,7 +162,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -179,7 +177,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter
     /**
      * This returns GroupDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -190,14 +188,14 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((GroupDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_GroupDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_GroupDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -205,7 +203,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -229,7 +227,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter
         }
         super.notifyChanged(notification);
     }
-    
+
     @Override
     protected CommandParameter createChildParameter(Object feature, Object child) {
         PropertiesItemProviderAdapterFactory.addNoopNavigationOperations(child);
@@ -241,7 +239,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated NOT
+     * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
@@ -259,16 +257,14 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createSelectDescription()));
 
-        DynamicMappingFor dynamicFor = PropertiesFactory.eINSTANCE.createDynamicMappingFor();
-        dynamicFor.getIfs().add(PropertiesFactory.eINSTANCE.createDynamicMappingIf());
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, dynamicFor));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createDynamicMappingFor()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createTextAreaDescription()));
 
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createListDescription()));
-
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createRadioDescription()));
 
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createListDescription()));
+
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createCustomDescription()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createHyperlinkDescription()));
@@ -277,9 +273,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createGroupStyle()));
 
-        GroupConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createGroupConditionalStyle();
-        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createGroupStyle());
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createGroupConditionalStyle()));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupStyleItemProvider.java
index 8355ba032d..4d45d4a50c 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupStyleItemProvider.java
@@ -35,7 +35,7 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.GroupStyle} object. <!-- begin-user-doc
  * --> <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class GroupStyleItemProvider extends ItemProviderAdapter
@@ -101,7 +101,7 @@ public class GroupStyleItemProvider extends ItemProviderAdapter
     /**
      * This adds a property descriptor for the Font Name Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addFontNameExpressionPropertyDescriptor(Object object) {
@@ -114,7 +114,7 @@ public class GroupStyleItemProvider extends ItemProviderAdapter
     /**
      * This adds a property descriptor for the Font Size Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addFontSizeExpressionPropertyDescriptor(Object object) {
@@ -177,14 +177,14 @@ public class GroupStyleItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((GroupStyle) object).getFontNameExpression();
         return label == null || label.length() == 0 ? getString("_UI_GroupStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_GroupStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -192,7 +192,7 @@ public class GroupStyleItemProvider extends ItemProviderAdapter
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java
index a7ae1d04b1..25070358be 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProvider.java
@@ -36,7 +36,7 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.GroupValidationSetDescription} object.
  * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class GroupValidationSetDescriptionItemProvider extends ItemProviderAdapter
@@ -73,7 +73,7 @@ public class GroupValidationSetDescriptionItemProvider extends ItemProviderAdapt
      * {@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
@@ -88,7 +88,7 @@ public class GroupValidationSetDescriptionItemProvider extends ItemProviderAdapt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -103,7 +103,7 @@ public class GroupValidationSetDescriptionItemProvider extends ItemProviderAdapt
     /**
      * This returns GroupValidationSetDescription.gif. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -114,7 +114,7 @@ public class GroupValidationSetDescriptionItemProvider extends ItemProviderAdapt
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -127,7 +127,7 @@ public class GroupValidationSetDescriptionItemProvider extends ItemProviderAdapt
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkDescriptionItemProvider.java
index 23589d8a22..d7da3b8ee2 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkDescriptionItemProvider.java
@@ -23,7 +23,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.properties.HyperlinkDescription;
-import org.eclipse.sirius.properties.HyperlinkWidgetConditionalStyle;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
@@ -96,7 +95,7 @@ public class HyperlinkDescriptionItemProvider extends WidgetDescriptionItemProvi
      * {@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
@@ -113,7 +112,7 @@ public class HyperlinkDescriptionItemProvider extends WidgetDescriptionItemProvi
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -128,7 +127,7 @@ public class HyperlinkDescriptionItemProvider extends WidgetDescriptionItemProvi
     /**
      * This returns HyperlinkDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -139,14 +138,14 @@ public class HyperlinkDescriptionItemProvider extends WidgetDescriptionItemProvi
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((HyperlinkDescription) object).getLabelExpression();
+        String label = ((HyperlinkDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_HyperlinkDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_HyperlinkDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -154,7 +153,7 @@ public class HyperlinkDescriptionItemProvider extends WidgetDescriptionItemProvi
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -175,7 +174,7 @@ public class HyperlinkDescriptionItemProvider extends WidgetDescriptionItemProvi
         }
         super.notifyChanged(notification);
     }
-    
+
     @Override
     protected CommandParameter createChildParameter(Object feature, Object child) {
         PropertiesItemProviderAdapterFactory.addNoopNavigationOperations(child);
@@ -187,7 +186,7 @@ public class HyperlinkDescriptionItemProvider extends WidgetDescriptionItemProvi
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated NOT
+     * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
@@ -197,9 +196,7 @@ public class HyperlinkDescriptionItemProvider extends WidgetDescriptionItemProvi
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.HYPERLINK_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createHyperlinkWidgetStyle()));
 
-        HyperlinkWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createHyperlinkWidgetConditionalStyle();
-        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createHyperlinkWidgetStyle());
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.HYPERLINK_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.HYPERLINK_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createHyperlinkWidgetConditionalStyle()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.HYPERLINK_DESCRIPTION__ACTIONS, PropertiesFactory.eINSTANCE.createWidgetAction()));
     }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkWidgetConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkWidgetConditionalStyleItemProvider.java
index 23bbd3c569..b9485168cd 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkWidgetConditionalStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkWidgetConditionalStyleItemProvider.java
@@ -27,7 +27,7 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.HyperlinkWidgetConditionalStyle} object.
  * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class HyperlinkWidgetConditionalStyleItemProvider extends WidgetConditionalStyleItemProvider {
@@ -63,7 +63,7 @@ public class HyperlinkWidgetConditionalStyleItemProvider extends WidgetCondition
      * {@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
@@ -77,7 +77,7 @@ public class HyperlinkWidgetConditionalStyleItemProvider extends WidgetCondition
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -92,7 +92,7 @@ public class HyperlinkWidgetConditionalStyleItemProvider extends WidgetCondition
     /**
      * This returns HyperlinkWidgetConditionalStyle.gif. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -103,14 +103,14 @@ public class HyperlinkWidgetConditionalStyleItemProvider extends WidgetCondition
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((HyperlinkWidgetConditionalStyle) object).getPreconditionExpression();
         return label == null || label.length() == 0 ? getString("_UI_HyperlinkWidgetConditionalStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_HyperlinkWidgetConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -118,7 +118,7 @@ public class HyperlinkWidgetConditionalStyleItemProvider extends WidgetCondition
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkWidgetStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkWidgetStyleItemProvider.java
index 183370c829..6df4e549f2 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkWidgetStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkWidgetStyleItemProvider.java
@@ -63,7 +63,7 @@ public class HyperlinkWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This adds a property descriptor for the Font Name Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addFontNameExpressionPropertyDescriptor(Object object) {
@@ -76,7 +76,7 @@ public class HyperlinkWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This adds a property descriptor for the Font Size Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addFontSizeExpressionPropertyDescriptor(Object object) {
@@ -115,7 +115,7 @@ public class HyperlinkWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns HyperlinkWidgetStyle.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -126,14 +126,14 @@ public class HyperlinkWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((HyperlinkWidgetStyle) object).getLabelFontNameExpression();
         return label == null || label.length() == 0 ? getString("_UI_HyperlinkWidgetStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_HyperlinkWidgetStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -141,7 +141,7 @@ public class HyperlinkWidgetStyleItemProvider extends WidgetStyleItemProvider {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
index af3e9575a7..960d4fc987 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.properties.LabelDescription;
-import org.eclipse.sirius.properties.LabelWidgetConditionalStyle;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
@@ -94,7 +93,7 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
      * {@link org.eclipse.emf.edit.command.RemoveCommand} or
      * {@link org.eclipse.emf.edit.command.MoveCommand} in
      * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -110,7 +109,7 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -125,7 +124,7 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns LabelDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -136,14 +135,14 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((LabelDescription) object).getLabelExpression();
+        String label = ((LabelDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_LabelDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_LabelDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -151,7 +150,7 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -177,7 +176,7 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated NOT
+     * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
@@ -185,9 +184,7 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.LABEL_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createLabelWidgetStyle()));
 
-        LabelWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createLabelWidgetConditionalStyle();
-        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createLabelWidgetStyle());
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.LABEL_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.LABEL_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createLabelWidgetConditionalStyle()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.LABEL_DESCRIPTION__ACTIONS, PropertiesFactory.eINSTANCE.createWidgetAction()));
     }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelWidgetConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelWidgetConditionalStyleItemProvider.java
index dde4519fa3..312aded099 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelWidgetConditionalStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelWidgetConditionalStyleItemProvider.java
@@ -27,7 +27,7 @@ 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 {
@@ -63,7 +63,7 @@ public class LabelWidgetConditionalStyleItemProvider extends WidgetConditionalSt
      * {@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
@@ -77,7 +77,7 @@ public class LabelWidgetConditionalStyleItemProvider extends WidgetConditionalSt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -92,7 +92,7 @@ public class LabelWidgetConditionalStyleItemProvider extends WidgetConditionalSt
     /**
      * This returns LabelWidgetConditionalStyle.gif. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -103,14 +103,14 @@ public class LabelWidgetConditionalStyleItemProvider extends WidgetConditionalSt
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((LabelWidgetConditionalStyle) object).getPreconditionExpression();
         return label == null || label.length() == 0 ? getString("_UI_LabelWidgetConditionalStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_LabelWidgetConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -118,7 +118,7 @@ public class LabelWidgetConditionalStyleItemProvider extends WidgetConditionalSt
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelWidgetStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelWidgetStyleItemProvider.java
index 3bafc36f63..e614b74a6e 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelWidgetStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelWidgetStyleItemProvider.java
@@ -64,7 +64,7 @@ public class LabelWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This adds a property descriptor for the Font Name Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addFontNameExpressionPropertyDescriptor(Object object) {
@@ -77,7 +77,7 @@ public class LabelWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This adds a property descriptor for the Font Size Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addFontSizeExpressionPropertyDescriptor(Object object) {
@@ -129,7 +129,7 @@ public class LabelWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns LabelWidgetStyle.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -140,14 +140,14 @@ public class LabelWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((LabelWidgetStyle) object).getLabelFontNameExpression();
         return label == null || label.length() == 0 ? getString("_UI_LabelWidgetStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_LabelWidgetStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -155,7 +155,7 @@ public class LabelWidgetStyleItemProvider extends WidgetStyleItemProvider {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LayoutDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LayoutDescriptionItemProvider.java
index 69d15d59b3..d05fe62e8c 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LayoutDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LayoutDescriptionItemProvider.java
@@ -63,7 +63,7 @@ public class LayoutDescriptionItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -76,7 +76,7 @@ public class LayoutDescriptionItemProvider extends ItemProviderAdapter
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListDescriptionItemProvider.java
index 37e13974bb..cdc5fb6141 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListDescriptionItemProvider.java
@@ -95,7 +95,7 @@ public class ListDescriptionItemProvider extends WidgetDescriptionItemProvider {
      * {@link org.eclipse.emf.edit.command.RemoveCommand} or
      * {@link org.eclipse.emf.edit.command.MoveCommand} in
      * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -112,7 +112,7 @@ public class ListDescriptionItemProvider extends WidgetDescriptionItemProvider {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -127,7 +127,7 @@ public class ListDescriptionItemProvider extends WidgetDescriptionItemProvider {
     /**
      * This returns ListDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -138,14 +138,14 @@ public class ListDescriptionItemProvider extends WidgetDescriptionItemProvider {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((ListDescription) object).getLabelExpression();
+        String label = ((ListDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_ListDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_ListDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -153,7 +153,7 @@ public class ListDescriptionItemProvider extends WidgetDescriptionItemProvider {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListWidgetConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListWidgetConditionalStyleItemProvider.java
index 25a112c15f..b01f0e74bf 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListWidgetConditionalStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListWidgetConditionalStyleItemProvider.java
@@ -63,7 +63,7 @@ public class ListWidgetConditionalStyleItemProvider extends WidgetConditionalSty
      * {@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
@@ -77,7 +77,7 @@ public class ListWidgetConditionalStyleItemProvider extends WidgetConditionalSty
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -92,7 +92,7 @@ public class ListWidgetConditionalStyleItemProvider extends WidgetConditionalSty
     /**
      * This returns ListWidgetConditionalStyle.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -103,14 +103,14 @@ public class ListWidgetConditionalStyleItemProvider extends WidgetConditionalSty
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((ListWidgetConditionalStyle) object).getPreconditionExpression();
         return label == null || label.length() == 0 ? getString("_UI_ListWidgetConditionalStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_ListWidgetConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -118,7 +118,7 @@ public class ListWidgetConditionalStyleItemProvider extends WidgetConditionalSty
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListWidgetStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListWidgetStyleItemProvider.java
index 5beaffc0bf..33beea931b 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListWidgetStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListWidgetStyleItemProvider.java
@@ -55,7 +55,7 @@ public class ListWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns ListWidgetStyle.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -66,14 +66,14 @@ public class ListWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((ListWidgetStyle) object).getLabelFontNameExpression();
         return label == null || label.length() == 0 ? getString("_UI_ListWidgetStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_ListWidgetStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -81,7 +81,7 @@ public class ListWidgetStyleItemProvider extends WidgetStyleItemProvider {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/OperationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/OperationDescriptionItemProvider.java
index 68b1e81723..c5183e43c1 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/OperationDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/OperationDescriptionItemProvider.java
@@ -72,7 +72,7 @@ public class OperationDescriptionItemProvider extends ItemProviderAdapter
      * {@link org.eclipse.emf.edit.command.RemoveCommand} or
      * {@link org.eclipse.emf.edit.command.MoveCommand} in
      * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -86,7 +86,7 @@ public class OperationDescriptionItemProvider extends ItemProviderAdapter
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -101,7 +101,7 @@ public class OperationDescriptionItemProvider extends ItemProviderAdapter
     /**
      * This returns OperationDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -112,7 +112,7 @@ public class OperationDescriptionItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -125,7 +125,7 @@ public class OperationDescriptionItemProvider extends ItemProviderAdapter
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
index 4a5a72ca61..af9e61bf5f 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
@@ -115,7 +115,7 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter
     /**
      * This adds a property descriptor for the Semantic Candidate Expression
      * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addSemanticCandidateExpressionPropertyDescriptor(Object object) {
@@ -128,7 +128,7 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter
     /**
      * This adds a property descriptor for the Precondition Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addPreconditionExpressionPropertyDescriptor(Object object) {
@@ -158,7 +158,7 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter
      * {@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
@@ -172,7 +172,7 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -187,7 +187,7 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter
     /**
      * This returns PageDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -198,14 +198,14 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((PageDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_PageDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_PageDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -213,7 +213,7 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java
index 60d5646534..7919774c23 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProvider.java
@@ -35,7 +35,7 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.PageValidationSetDescription} object.
  * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class PageValidationSetDescriptionItemProvider extends ItemProviderAdapter
@@ -72,7 +72,7 @@ public class PageValidationSetDescriptionItemProvider extends ItemProviderAdapte
      * {@link org.eclipse.emf.edit.command.RemoveCommand} or
      * {@link org.eclipse.emf.edit.command.MoveCommand} in
      * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -86,7 +86,7 @@ public class PageValidationSetDescriptionItemProvider extends ItemProviderAdapte
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -101,7 +101,7 @@ public class PageValidationSetDescriptionItemProvider extends ItemProviderAdapte
     /**
      * This returns PageValidationSetDescription.gif. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -112,7 +112,7 @@ public class PageValidationSetDescriptionItemProvider extends ItemProviderAdapte
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -125,7 +125,7 @@ public class PageValidationSetDescriptionItemProvider extends ItemProviderAdapte
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java
index 454d712886..d21d33263e 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java
@@ -41,7 +41,7 @@ public final class PropertiesEditPlugin extends EMFPlugin {
 
     /**
      * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     public PropertiesEditPlugin() {
@@ -51,7 +51,7 @@ public final class PropertiesEditPlugin extends EMFPlugin {
     /**
      * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
+     * 
      * @return the singleton instance.
      * @generated
      */
@@ -63,7 +63,7 @@ public final class PropertiesEditPlugin extends EMFPlugin {
     /**
      * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
+     * 
      * @return the singleton instance.
      * @generated
      */
@@ -80,7 +80,7 @@ public final class PropertiesEditPlugin extends EMFPlugin {
     public static class Implementation extends EclipsePlugin {
         /**
          * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * 
          * @generated
          */
         public Implementation() {
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
index 2e91f3d82a..bfd1d34ef2 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
@@ -36,11 +36,8 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.sirius.properties.GroupDescription;
-import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
-import org.eclipse.sirius.properties.ViewExtensionDescription;
 import org.eclipse.sirius.properties.util.PropertiesAdapterFactory;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.Group;
@@ -60,14 +57,14 @@ import org.eclipse.sirius.viewpoint.description.validation.util.ValidationSwitch
  * adapters also support Eclipse property sheets. Note that most of the adapters
  * are shared among multiple instances. <!-- begin-user-doc --> <!--
  * end-user-doc -->
- *
+ * 
  * @generated
  */
 public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender {
     /**
      * This keeps track of the root adapter factory that delegates to this
      * adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected ComposedAdapterFactory parentAdapterFactory;
@@ -84,7 +81,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     /**
      * This helps manage the child creation extenders. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(PropertiesEditPlugin.INSTANCE, PropertiesPackage.eNS_URI);
@@ -93,7 +90,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of all the supported types checked by
      * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -116,7 +113,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.ViewExtensionDescription} instances.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected ViewExtensionDescriptionItemProvider viewExtensionDescriptionItemProvider;
@@ -166,7 +163,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.PageValidationSetDescription}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected PageValidationSetDescriptionItemProvider pageValidationSetDescriptionItemProvider;
@@ -191,7 +188,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.PropertyValidationRule} instances.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected PropertyValidationRuleItemProvider propertyValidationRuleItemProvider;
@@ -241,7 +238,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.GroupValidationSetDescription}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected GroupValidationSetDescriptionItemProvider groupValidationSetDescriptionItemProvider;
@@ -266,7 +263,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.ContainerDescription} instances.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected ContainerDescriptionItemProvider containerDescriptionItemProvider;
@@ -291,7 +288,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.FillLayoutDescription} instances.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected FillLayoutDescriptionItemProvider fillLayoutDescriptionItemProvider;
@@ -316,7 +313,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.GridLayoutDescription} instances.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected GridLayoutDescriptionItemProvider gridLayoutDescriptionItemProvider;
@@ -591,7 +588,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.OperationDescription} instances.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected OperationDescriptionItemProvider operationDescriptionItemProvider;
@@ -691,7 +688,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.HyperlinkDescription} instances.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected HyperlinkDescriptionItemProvider hyperlinkDescriptionItemProvider;
@@ -725,7 +722,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.WidgetStyle}. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -941,7 +938,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.HyperlinkWidgetStyle} instances.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected HyperlinkWidgetStyleItemProvider hyperlinkWidgetStyleItemProvider;
@@ -975,7 +972,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.GroupStyle}. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -991,7 +988,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * 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;
@@ -1016,7 +1013,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * 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;
@@ -1041,7 +1038,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * 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;
@@ -1050,7 +1047,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle}.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -1066,7 +1063,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * 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;
@@ -1091,7 +1088,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * 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;
@@ -1116,7 +1113,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * 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;
@@ -1141,7 +1138,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * 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;
@@ -1166,7 +1163,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.ListWidgetConditionalStyle}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected ListWidgetConditionalStyleItemProvider listWidgetConditionalStyleItemProvider;
@@ -1200,7 +1197,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.WidgetAction}. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -1216,7 +1213,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.HyperlinkWidgetConditionalStyle}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected HyperlinkWidgetConditionalStyleItemProvider hyperlinkWidgetConditionalStyleItemProvider;
@@ -1225,7 +1222,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.HyperlinkWidgetConditionalStyle}.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -1241,7 +1238,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.GroupConditionalStyle} instances.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected GroupConditionalStyleItemProvider groupConditionalStyleItemProvider;
@@ -1275,7 +1272,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.EditSupport}. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -1311,7 +1308,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -1322,7 +1319,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     /**
      * This implementation substitutes the factory itself as the key for the
      * adapter. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -1332,7 +1329,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -1349,7 +1346,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     public List<IChildCreationExtender> getChildCreationExtenders() {
@@ -1358,7 +1355,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -1368,7 +1365,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -1378,7 +1375,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -1388,7 +1385,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
     /**
      * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -1566,7 +1563,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     /**
      * Add default "Begin" operations with a no-op navigation to the specific
      * element.
-     * 
+     *
      * @param child
      *            a newly created child.
      */
@@ -1595,14 +1592,14 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
         /**
          * The switch for creating child descriptors specific to each extended
          * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * 
          * @generated
          */
         protected static class CreationSwitch extends DescriptionSwitch<Object> {
             /**
              * The child descriptors being populated. <!-- begin-user-doc -->
              * <!-- end-user-doc -->
-             *
+             * 
              * @generated
              */
             protected List<Object> newChildDescriptors;
@@ -1610,7 +1607,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
             /**
              * The domain in which to create the children. <!-- begin-user-doc
              * --> <!-- end-user-doc -->
-             *
+             * 
              * @generated
              */
             protected EditingDomain editingDomain;
@@ -1618,7 +1615,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
             /**
              * Creates the a switch for populating child descriptors in the
              * given domain. <!-- begin-user-doc --> <!-- end-user-doc -->
-             *
+             * 
              * @generated
              */
             CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
@@ -1628,31 +1625,19 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
             /**
              * <!-- begin-user-doc --> <!-- end-user-doc -->
-             *
-             * @generated NOT
+             * 
+             * @generated
              */
             @Override
             public Object caseGroup(Group object) {
-                ViewExtensionDescription ved = PropertiesFactory.eINSTANCE.createViewExtensionDescription();
-                ved.setIdentifier("Properties"); //$NON-NLS-1$
-                PageDescription page = PropertiesFactory.eINSTANCE.createPageDescription();
-                page.setIdentifier("Default"); //$NON-NLS-1$
-                page.setLabelExpression("Page"); //$NON-NLS-1$
-                page.setSemanticCandidateExpression(ViewExtensionDescriptionItemProvider.DEFAULT_SEMANTIC_CANDIDATES_EXPRESSION);
-                ved.getPages().add(page);
-                GroupDescription group = PropertiesFactory.eINSTANCE.createGroupDescription();
-                group.setIdentifier("Default"); //$NON-NLS-1$
-                group.setLabelExpression("Group"); //$NON-NLS-1$
-                group.setSemanticCandidateExpression(ViewExtensionDescriptionItemProvider.DEFAULT_SEMANTIC_CANDIDATES_EXPRESSION);
-                ved.getGroups().add(group);
-                page.getGroups().add(group);
-                newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.GROUP__EXTENSIONS, ved));
+                newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.GROUP__EXTENSIONS, PropertiesFactory.eINSTANCE.createViewExtensionDescription()));
+
                 return null;
             }
 
             /**
              * <!-- begin-user-doc --> <!-- end-user-doc -->
-             *
+             * 
              * @generated
              */
             protected CommandParameter createChildParameter(Object feature, Object child) {
@@ -1663,7 +1648,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * 
          * @generated
          */
         @Override
@@ -1675,7 +1660,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * 
          * @generated
          */
         @Override
@@ -1694,14 +1679,14 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
         /**
          * The switch for creating child descriptors specific to each extended
          * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * 
          * @generated
          */
         protected static class CreationSwitch extends ValidationSwitch<Object> {
             /**
              * The child descriptors being populated. <!-- begin-user-doc -->
              * <!-- end-user-doc -->
-             *
+             * 
              * @generated
              */
             protected List<Object> newChildDescriptors;
@@ -1709,7 +1694,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
             /**
              * The domain in which to create the children. <!-- begin-user-doc
              * --> <!-- end-user-doc -->
-             *
+             * 
              * @generated
              */
             protected EditingDomain editingDomain;
@@ -1717,7 +1702,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
             /**
              * Creates the a switch for populating child descriptors in the
              * given domain. <!-- begin-user-doc --> <!-- end-user-doc -->
-             *
+             * 
              * @generated
              */
             CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
@@ -1727,7 +1712,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
             /**
              * <!-- begin-user-doc --> <!-- end-user-doc -->
-             *
+             * 
              * @generated
              */
             @Override
@@ -1739,7 +1724,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
             /**
              * <!-- begin-user-doc --> <!-- end-user-doc -->
-             *
+             * 
              * @generated
              */
             protected CommandParameter createChildParameter(Object feature, Object child) {
@@ -1750,7 +1735,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * 
          * @generated
          */
         @Override
@@ -1762,7 +1747,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * 
          * @generated
          */
         @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java
index b4370d98d8..af4c380031 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProvider.java
@@ -72,7 +72,7 @@ public class PropertyValidationRuleItemProvider extends ValidationRuleItemProvid
     /**
      * This returns PropertyValidationRule.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -83,14 +83,14 @@ public class PropertyValidationRuleItemProvider extends ValidationRuleItemProvid
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((PropertyValidationRule) object).getName();
         return label == null || label.length() == 0 ? getString("_UI_PropertyValidationRule_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_PropertyValidationRule_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -98,7 +98,7 @@ public class PropertyValidationRuleItemProvider extends ValidationRuleItemProvid
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java
index 63ea95a674..ce34660c09 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java
@@ -24,7 +24,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.RadioDescription;
-import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 
 /**
@@ -80,7 +79,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This adds a property descriptor for the Candidates Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addCandidatesExpressionPropertyDescriptor(Object object) {
@@ -93,7 +92,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This adds a property descriptor for the Candidate Display Expression
      * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addCandidateDisplayExpressionPropertyDescriptor(Object object) {
@@ -123,7 +122,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
      * {@link org.eclipse.emf.edit.command.RemoveCommand} or
      * {@link org.eclipse.emf.edit.command.MoveCommand} in
      * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -139,7 +138,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -154,7 +153,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns RadioDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -165,14 +164,14 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((RadioDescription) object).getLabelExpression();
+        String label = ((RadioDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_RadioDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_RadioDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -180,7 +179,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -208,7 +207,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated NOT
+     * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
@@ -218,9 +217,7 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.RADIO_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createRadioWidgetStyle()));
 
-        RadioWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createRadioWidgetConditionalStyle();
-        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createRadioWidgetStyle());
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.RADIO_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.RADIO_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createRadioWidgetConditionalStyle()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioWidgetConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioWidgetConditionalStyleItemProvider.java
index b941f853b3..ec214bcbf2 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioWidgetConditionalStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioWidgetConditionalStyleItemProvider.java
@@ -27,7 +27,7 @@ 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 {
@@ -63,7 +63,7 @@ public class RadioWidgetConditionalStyleItemProvider extends WidgetConditionalSt
      * {@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
@@ -77,7 +77,7 @@ public class RadioWidgetConditionalStyleItemProvider extends WidgetConditionalSt
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -92,7 +92,7 @@ public class RadioWidgetConditionalStyleItemProvider extends WidgetConditionalSt
     /**
      * This returns RadioWidgetConditionalStyle.gif. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -103,14 +103,14 @@ public class RadioWidgetConditionalStyleItemProvider extends WidgetConditionalSt
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((RadioWidgetConditionalStyle) object).getPreconditionExpression();
         return label == null || label.length() == 0 ? getString("_UI_RadioWidgetConditionalStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_RadioWidgetConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -118,7 +118,7 @@ public class RadioWidgetConditionalStyleItemProvider extends WidgetConditionalSt
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioWidgetStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioWidgetStyleItemProvider.java
index c51511763c..b582ffd1b6 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioWidgetStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioWidgetStyleItemProvider.java
@@ -55,7 +55,7 @@ public class RadioWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns RadioWidgetStyle.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -66,14 +66,14 @@ public class RadioWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((RadioWidgetStyle) object).getLabelFontNameExpression();
         return label == null || label.length() == 0 ? getString("_UI_RadioWidgetStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_RadioWidgetStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -81,7 +81,7 @@ public class RadioWidgetStyleItemProvider extends WidgetStyleItemProvider {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
index 1895854963..b628f6eef8 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
@@ -24,7 +24,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.SelectDescription;
-import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 
 /**
@@ -79,7 +78,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This adds a property descriptor for the Candidates Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addCandidatesExpressionPropertyDescriptor(Object object) {
@@ -92,7 +91,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This adds a property descriptor for the Candidate Display Expression
      * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addCandidateDisplayExpressionPropertyDescriptor(Object object) {
@@ -109,7 +108,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
      * {@link org.eclipse.emf.edit.command.RemoveCommand} or
      * {@link org.eclipse.emf.edit.command.MoveCommand} in
      * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -125,7 +124,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -140,7 +139,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns SelectDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -151,14 +150,14 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((SelectDescription) object).getLabelExpression();
+        String label = ((SelectDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_SelectDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_SelectDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -166,7 +165,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -193,7 +192,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated NOT
+     * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
@@ -203,9 +202,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.SELECT_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createSelectWidgetStyle()));
 
-        SelectWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createSelectWidgetConditionalStyle();
-        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createSelectWidgetStyle());
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.SELECT_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.SELECT_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createSelectWidgetConditionalStyle()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectWidgetConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectWidgetConditionalStyleItemProvider.java
index 42c311eeee..1cc31e7bdf 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectWidgetConditionalStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectWidgetConditionalStyleItemProvider.java
@@ -27,7 +27,7 @@ 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 {
@@ -63,7 +63,7 @@ public class SelectWidgetConditionalStyleItemProvider extends WidgetConditionalS
      * {@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
@@ -77,7 +77,7 @@ public class SelectWidgetConditionalStyleItemProvider extends WidgetConditionalS
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -92,7 +92,7 @@ public class SelectWidgetConditionalStyleItemProvider extends WidgetConditionalS
     /**
      * This returns SelectWidgetConditionalStyle.gif. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -103,14 +103,14 @@ public class SelectWidgetConditionalStyleItemProvider extends WidgetConditionalS
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((SelectWidgetConditionalStyle) object).getPreconditionExpression();
         return label == null || label.length() == 0 ? getString("_UI_SelectWidgetConditionalStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_SelectWidgetConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -118,7 +118,7 @@ public class SelectWidgetConditionalStyleItemProvider extends WidgetConditionalS
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectWidgetStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectWidgetStyleItemProvider.java
index 906ecab0d8..e8d37b36fc 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectWidgetStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectWidgetStyleItemProvider.java
@@ -55,7 +55,7 @@ public class SelectWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns SelectWidgetStyle.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -66,14 +66,14 @@ public class SelectWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((SelectWidgetStyle) object).getLabelFontNameExpression();
         return label == null || label.length() == 0 ? getString("_UI_SelectWidgetStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_SelectWidgetStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -81,7 +81,7 @@ public class SelectWidgetStyleItemProvider extends WidgetStyleItemProvider {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java
index 56da80a6fc..f52a33877a 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java
@@ -73,7 +73,7 @@ public class TextAreaDescriptionItemProvider extends TextDescriptionItemProvider
     /**
      * This returns TextAreaDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -84,14 +84,14 @@ public class TextAreaDescriptionItemProvider extends TextDescriptionItemProvider
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((TextAreaDescription) object).getLabelExpression();
+        String label = ((TextAreaDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_TextAreaDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_TextAreaDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -99,7 +99,7 @@ public class TextAreaDescriptionItemProvider extends TextDescriptionItemProvider
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
index 8ad5005935..023ee08dbc 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
@@ -24,7 +24,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.TextDescription;
-import org.eclipse.sirius.properties.TextWidgetConditionalStyle;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
 
 /**
@@ -81,7 +80,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
      * {@link org.eclipse.emf.edit.command.RemoveCommand} or
      * {@link org.eclipse.emf.edit.command.MoveCommand} in
      * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -97,7 +96,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -112,7 +111,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     /**
      * This returns TextDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -123,14 +122,14 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((TextDescription) object).getLabelExpression();
+        String label = ((TextDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_TextDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_TextDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -138,7 +137,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -163,7 +162,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated NOT
+     * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
@@ -173,9 +172,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createTextWidgetStyle()));
 
-        TextWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createTextWidgetConditionalStyle();
-        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createTextWidgetStyle());
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__CONDITIONAL_STYLES, PropertiesFactory.eINSTANCE.createTextWidgetConditionalStyle()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextWidgetConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextWidgetConditionalStyleItemProvider.java
index 2022b796c7..c310e900ef 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextWidgetConditionalStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextWidgetConditionalStyleItemProvider.java
@@ -63,7 +63,7 @@ public class TextWidgetConditionalStyleItemProvider extends WidgetConditionalSty
      * {@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
@@ -77,7 +77,7 @@ public class TextWidgetConditionalStyleItemProvider extends WidgetConditionalSty
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -92,7 +92,7 @@ public class TextWidgetConditionalStyleItemProvider extends WidgetConditionalSty
     /**
      * This returns TextWidgetConditionalStyle.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -103,14 +103,14 @@ public class TextWidgetConditionalStyleItemProvider extends WidgetConditionalSty
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((TextWidgetConditionalStyle) object).getPreconditionExpression();
         return label == null || label.length() == 0 ? getString("_UI_TextWidgetConditionalStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_TextWidgetConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -118,7 +118,7 @@ public class TextWidgetConditionalStyleItemProvider extends WidgetConditionalSty
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextWidgetStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextWidgetStyleItemProvider.java
index 564607df39..1f78936073 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextWidgetStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextWidgetStyleItemProvider.java
@@ -64,7 +64,7 @@ public class TextWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This adds a property descriptor for the Font Name Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addFontNameExpressionPropertyDescriptor(Object object) {
@@ -77,7 +77,7 @@ public class TextWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This adds a property descriptor for the Font Size Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addFontSizeExpressionPropertyDescriptor(Object object) {
@@ -129,7 +129,7 @@ public class TextWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns TextWidgetStyle.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -140,14 +140,14 @@ public class TextWidgetStyleItemProvider extends WidgetStyleItemProvider {
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((TextWidgetStyle) object).getLabelFontNameExpression();
         return label == null || label.length() == 0 ? getString("_UI_TextWidgetStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_TextWidgetStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -155,7 +155,7 @@ public class TextWidgetStyleItemProvider extends WidgetStyleItemProvider {
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
index 2b750f1b57..dd09886f21 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
@@ -29,8 +29,6 @@ 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.GroupDescription;
-import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
@@ -110,7 +108,7 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter
      * {@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
@@ -125,7 +123,7 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -140,7 +138,7 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter
     /**
      * This returns ViewExtensionDescription.gif. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -151,14 +149,14 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((ViewExtensionDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_ViewExtensionDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_ViewExtensionDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -166,7 +164,7 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -190,21 +188,15 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated NOT
+     * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        PageDescription page = PropertiesFactory.eINSTANCE.createPageDescription();
-        page.setLabelExpression("Page"); //$NON-NLS-1$
-        page.setSemanticCandidateExpression(ViewExtensionDescriptionItemProvider.DEFAULT_SEMANTIC_CANDIDATES_EXPRESSION);
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__PAGES, page));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__PAGES, PropertiesFactory.eINSTANCE.createPageDescription()));
 
-        GroupDescription group = PropertiesFactory.eINSTANCE.createGroupDescription();
-        group.setLabelExpression("Group"); //$NON-NLS-1$
-        group.setSemanticCandidateExpression(ViewExtensionDescriptionItemProvider.DEFAULT_SEMANTIC_CANDIDATES_EXPRESSION);
-        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__GROUPS, group));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__GROUPS, PropertiesFactory.eINSTANCE.createGroupDescription()));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetActionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetActionItemProvider.java
index 41a8dd1760..bc24d6228c 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetActionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetActionItemProvider.java
@@ -88,7 +88,7 @@ public class WidgetActionItemProvider extends ItemProviderAdapter
      * {@link org.eclipse.emf.edit.command.RemoveCommand} or
      * {@link org.eclipse.emf.edit.command.MoveCommand} in
      * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -102,7 +102,7 @@ public class WidgetActionItemProvider extends ItemProviderAdapter
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
@@ -128,14 +128,14 @@ public class WidgetActionItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((WidgetAction) object).getLabelExpression();
         return label == null || label.length() == 0 ? getString("_UI_WidgetAction_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_WidgetAction_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -143,7 +143,7 @@ public class WidgetActionItemProvider extends ItemProviderAdapter
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetConditionalStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetConditionalStyleItemProvider.java
index 80dd7db2ee..09e27e5155 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetConditionalStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetConditionalStyleItemProvider.java
@@ -69,7 +69,7 @@ public class WidgetConditionalStyleItemProvider extends ItemProviderAdapter
     /**
      * This adds a property descriptor for the Precondition Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addPreconditionExpressionPropertyDescriptor(Object object) {
@@ -82,14 +82,14 @@ public class WidgetConditionalStyleItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((WidgetConditionalStyle) object).getPreconditionExpression();
         return label == null || label.length() == 0 ? getString("_UI_WidgetConditionalStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_WidgetConditionalStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -97,7 +97,7 @@ public class WidgetConditionalStyleItemProvider extends ItemProviderAdapter
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
index bc090edc83..50752925ac 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
@@ -88,7 +88,7 @@ public class WidgetDescriptionItemProvider extends ControlDescriptionItemProvide
     /**
      * This adds a property descriptor for the Is Enabled Expression feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addIsEnabledExpressionPropertyDescriptor(Object object) {
@@ -101,14 +101,14 @@ public class WidgetDescriptionItemProvider extends ControlDescriptionItemProvide
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((WidgetDescription) object).getIdentifier();
         return label == null || label.length() == 0 ? getString("_UI_WidgetDescription_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_WidgetDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -116,7 +116,7 @@ public class WidgetDescriptionItemProvider extends ControlDescriptionItemProvide
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java
index 41ccba92eb..596eb6a3ae 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetStyleItemProvider.java
@@ -35,7 +35,7 @@ import org.eclipse.sirius.properties.WidgetStyle;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.WidgetStyle} object. <!-- begin-user-doc
  * --> <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class WidgetStyleItemProvider extends ItemProviderAdapter
@@ -73,7 +73,7 @@ public class WidgetStyleItemProvider extends ItemProviderAdapter
     /**
      * This adds a property descriptor for the Label Font Name Expression
      * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addLabelFontNameExpressionPropertyDescriptor(Object object) {
@@ -86,7 +86,7 @@ public class WidgetStyleItemProvider extends ItemProviderAdapter
     /**
      * This adds a property descriptor for the Label Font Size Expression
      * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addLabelFontSizeExpressionPropertyDescriptor(Object object) {
@@ -99,7 +99,7 @@ public class WidgetStyleItemProvider extends ItemProviderAdapter
     /**
      * This adds a property descriptor for the Label Background Color feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addLabelBackgroundColorPropertyDescriptor(Object object) {
@@ -112,7 +112,7 @@ public class WidgetStyleItemProvider extends ItemProviderAdapter
     /**
      * This adds a property descriptor for the Label Foreground Color feature.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
      * @generated
      */
     protected void addLabelForegroundColorPropertyDescriptor(Object object) {
@@ -149,14 +149,14 @@ public class WidgetStyleItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
-     * @generated NOT
+     * 
+     * @generated
      */
     @Override
     public String getText(Object object) {
         String label = ((WidgetStyle) object).getLabelFontNameExpression();
         return label == null || label.length() == 0 ? getString("_UI_WidgetStyle_type") : //$NON-NLS-1$
-                label;
+                getString("_UI_WidgetStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -164,7 +164,7 @@ public class WidgetStyleItemProvider extends ItemProviderAdapter
      * update any cached children and by creating a viewer notification, which
      * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
+     * 
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-generator/org/eclipse/sirius/properties/edit/internal/generator/GapPatternGenerator.java b/plugins/org.eclipse.sirius.properties.edit/src-generator/org/eclipse/sirius/properties/edit/internal/generator/GapPatternGenerator.java
new file mode 100644
index 0000000000..dc3609e52f
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-generator/org/eclipse/sirius/properties/edit/internal/generator/GapPatternGenerator.java
@@ -0,0 +1,298 @@
+/**
+ * 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.edit.internal.generator;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
+
+/**
+ * Utility class used to generate the Java classes used for the generation gap
+ * pattern of the EMF Edit part.
+ * 
+ * @author sbegaudeau
+ */
+@SuppressWarnings({ "checkstyle:multiplestringliterals" })
+public final class GapPatternGenerator {
+    /**
+     * The constructor.
+     */
+    private GapPatternGenerator() {
+        // do nothing
+    }
+
+    /**
+     * The entry point of our generator.
+     * 
+     * @param args
+     *            The arguments (unused)
+     */
+    public static void main(String[] args) {
+        String userDir = System.getProperty("user.dir"); //$NON-NLS-1$
+        Path siriusPropertiesEditProjectPath = Paths.get(userDir);
+        Path siriusPropertiesProjectPath = siriusPropertiesEditProjectPath.getParent().resolve("org.eclipse.sirius.properties"); //$NON-NLS-1$
+        Path ecoreModel = siriusPropertiesProjectPath.resolve("model/properties.ecore"); //$NON-NLS-1$
+
+        ResourceSet resourceSet = new ResourceSetImpl();
+        resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("ecore", new EcoreResourceFactoryImpl()); //$NON-NLS-1$
+        URI uri = URI.createFileURI(ecoreModel.toAbsolutePath().toString());
+
+        Path outputFolderPath = siriusPropertiesEditProjectPath.resolve("src-spec/org/eclipse/sirius/properties/provider"); //$NON-NLS-1$
+
+        Resource resource = resourceSet.getResource(uri, true);
+        if (resource != null && resource.getContents().size() == 1 && resource.getContents().get(0) instanceof EPackage) {
+            EPackage ePackage = (EPackage) resource.getContents().get(0);
+
+            GapPatternGenerator.generateAdapterFactory(outputFolderPath, ePackage);
+            GapPatternGenerator.generateDescriptionChildCreationExtender(outputFolderPath, ePackage);
+            GapPatternGenerator.generateValidationChildCreationExtender(outputFolderPath, ePackage);
+
+            List<EClassifier> eClassifiers = ePackage.getEClassifiers();
+            for (EClassifier eClassifier : eClassifiers) {
+                if (eClassifier instanceof EClass) {
+                    GapPatternGenerator.generateItemProvider(outputFolderPath, (EClass) eClassifier);
+                }
+            }
+        }
+    }
+
+    /**
+     * Appends the copyrights to the given string builder and returns it.
+     * 
+     * @param builder
+     *            The string builder
+     * @return The given string builder
+     */
+    private static StringBuilder appendCopyright(StringBuilder builder) {
+        builder.append("/**").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" * Copyright (c) 2017 Obeo.").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" * All rights reserved. This program and the accompanying materials").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" * are made available under the terms of the Eclipse Public License v1.0").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" * which accompanies this distribution, and is available at").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" * http://www.eclipse.org/legal/epl-v10.html").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" *").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" * Contributors:").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" *    Obeo - initial API and implementation").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" *").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" */").append(System.lineSeparator()); //$NON-NLS-1$
+        return builder;
+    }
+
+    /**
+     * Returns the given word with the first character in upper case.
+     * 
+     * @param word
+     *            The word
+     * @return The given word with the first character in upper case
+     */
+    private static String toUpperFirst(String word) {
+        return word.substring(0, 1).toUpperCase() + word.substring(1);
+    }
+
+    /**
+     * Returns the given word with the first character in lower case.
+     * 
+     * @param word
+     *            The word
+     * @return The given word with the first character in lower case
+     */
+    private static String toLowerFirst(String word) {
+        return word.substring(0, 1).toLowerCase() + word.substring(1);
+    }
+
+    /**
+     * Writes the file at the given location with the given content.
+     * 
+     * @param outputFilePath
+     *            The file location
+     * @param builder
+     *            The content
+     * @param force
+     *            <code>true</code> to indicate that we should overwrite the
+     *            existing file, if any, <code>false</code> otherwise
+     */
+    private static void writeSourceFile(Path outputFilePath, StringBuilder builder, boolean force) {
+        File parentFolder = outputFilePath.toFile().getParentFile();
+        if (!parentFolder.exists()) {
+            parentFolder.mkdirs();
+        }
+        if (!outputFilePath.toFile().exists() || force) {
+            try {
+                Files.write(outputFilePath, builder.toString().getBytes());
+            } catch (IOException e) {
+                // CHECKSTYLE:OFF
+                e.printStackTrace();
+                // CHECKSTYLE:ON
+            }
+        }
+    }
+
+    /**
+     * Generates the adapter factory for the given EPackage in the given output
+     * folder.
+     * 
+     * @param outputFolderPath
+     *            The path of the output folder
+     * @param ePackage
+     *            The EPackage
+     */
+    private static void generateAdapterFactory(Path outputFolderPath, EPackage ePackage) {
+        StringBuilder builder = GapPatternGenerator.appendCopyright(new StringBuilder());
+
+        builder.append("package org.eclipse.sirius.properties.provider;").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(System.lineSeparator());
+        builder.append("import org.eclipse.emf.common.notify.Adapter;").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(System.lineSeparator());
+        builder.append("/**").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" * Subclass used to not have to modify the generated code.").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" *").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" * @author ").append(System.getProperty("user.name")).append(System.lineSeparator()); //$NON-NLS-1$ //$NON-NLS-2$
+        builder.append(" */").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append("public class PropertiesItemProviderAdapterFactorySpec extends PropertiesItemProviderAdapterFactory {").append(System.lineSeparator()); //$NON-NLS-1$
+
+        for (EClassifier eClassifier : ePackage.getEClassifiers()) {
+            if (eClassifier instanceof EClass && !((EClass) eClassifier).isAbstract() && !((EClass) eClassifier).isInterface()) {
+                builder.append(System.lineSeparator());
+                builder.append("    @Override").append(System.lineSeparator()); //$NON-NLS-1$
+                builder.append("    public Adapter create" + GapPatternGenerator.toUpperFirst(eClassifier.getName()) + "Adapter() {").append(System.lineSeparator()); //$NON-NLS-1$ //$NON-NLS-2$
+                builder.append("        if (" + GapPatternGenerator.toLowerFirst(eClassifier.getName()) + "ItemProvider == null) {").append(System.lineSeparator()); //$NON-NLS-1$ //$NON-NLS-2$
+                builder.append("            " + GapPatternGenerator.toLowerFirst(eClassifier.getName()) + "ItemProvider = new " + GapPatternGenerator.toUpperFirst(eClassifier.getName()) //$NON-NLS-1$ //$NON-NLS-2$
+                        + "ItemProviderSpec(this);") //$NON-NLS-1$
+                        .append(System.lineSeparator());
+                builder.append("        }").append(System.lineSeparator()); //$NON-NLS-1$
+                builder.append(System.lineSeparator());
+                builder.append("        return " + GapPatternGenerator.toLowerFirst(eClassifier.getName()) + "ItemProvider;").append(System.lineSeparator()); //$NON-NLS-1$ //$NON-NLS-2$
+                builder.append("    }").append(System.lineSeparator()); //$NON-NLS-1$
+            }
+        }
+
+        builder.append("}").append(System.lineSeparator()); //$NON-NLS-1$
+
+        String className = GapPatternGenerator.toUpperFirst(ePackage.getName()) + "ItemProviderAdapterFactorySpec.java"; //$NON-NLS-1$
+        Path outputFilePath = outputFolderPath.resolve(className);
+
+        GapPatternGenerator.writeSourceFile(outputFilePath, builder, true);
+    }
+
+    /**
+     * Generates the description child creation extender for the given EPackage
+     * in the given output folder.
+     * 
+     * @param outputFolderPath
+     *            The path of the output folder
+     * @param ePackage
+     *            The EPackage
+     */
+    private static void generateDescriptionChildCreationExtender(Path outputFolderPath, EPackage ePackage) {
+        StringBuilder builder = GapPatternGenerator.appendCopyright(new StringBuilder());
+        builder.append("package org.eclipse.sirius.properties.provider;").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(System.lineSeparator());
+        builder.append("import org.eclipse.sirius.properties.provider.PropertiesItemProviderAdapterFactory.DescriptionChildCreationExtender;").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(System.lineSeparator());
+        builder.append("/**").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" * Subclass used to not have to modify the generated code.").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" *").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" * @author ").append(System.getProperty("user.name")).append(System.lineSeparator()); //$NON-NLS-1$ //$NON-NLS-2$
+        builder.append(" */").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append("public class DescriptionChildCreationExtenderSpec extends DescriptionChildCreationExtender {") //$NON-NLS-1$
+                .append(System.lineSeparator());
+        builder.append("}").append(System.lineSeparator()); //$NON-NLS-1$
+
+        String className = "DescriptionChildCreationExtenderSpec.java"; //$NON-NLS-1$
+        Path outputFilePath = outputFolderPath.resolve(className);
+
+        GapPatternGenerator.writeSourceFile(outputFilePath, builder, false);
+    }
+
+    /**
+     * Generates the validation child creation extender for the given EPackage
+     * in the given output folder.
+     * 
+     * @param outputFolderPath
+     *            The path of the output folder
+     * @param ePackage
+     *            The EPackage
+     */
+    private static void generateValidationChildCreationExtender(Path outputFolderPath, EPackage ePackage) {
+        StringBuilder builder = GapPatternGenerator.appendCopyright(new StringBuilder());
+        builder.append("package org.eclipse.sirius.properties.provider;").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(System.lineSeparator());
+        builder.append("import org.eclipse.sirius.properties.provider.PropertiesItemProviderAdapterFactory.ValidationChildCreationExtender;").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(System.lineSeparator());
+        builder.append("/**").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" * Subclass used to not have to modify the generated code.").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" *").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" * @author ").append(System.getProperty("user.name")).append(System.lineSeparator()); //$NON-NLS-1$ //$NON-NLS-2$
+        builder.append(" */").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append("public class ValidationChildCreationExtenderSpec extends ValidationChildCreationExtender {") //$NON-NLS-1$
+                .append(System.lineSeparator());
+        builder.append("}").append(System.lineSeparator()); //$NON-NLS-1$
+
+        String className = "ValidationChildCreationExtenderSpec.java"; //$NON-NLS-1$
+        Path outputFilePath = outputFolderPath.resolve(className);
+
+        GapPatternGenerator.writeSourceFile(outputFilePath, builder, false);
+    }
+
+    /**
+     * Generates the item provider for the given EClass in the given output
+     * folder.
+     * 
+     * @param outputFolderPath
+     *            The path of the output folder
+     * @param eClass
+     *            The EClass
+     */
+    private static void generateItemProvider(Path outputFolderPath, EClass eClass) {
+        StringBuilder builder = GapPatternGenerator.appendCopyright(new StringBuilder());
+        builder.append("package org.eclipse.sirius.properties.provider;").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(System.lineSeparator());
+        builder.append("import org.eclipse.emf.common.notify.AdapterFactory;").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(System.lineSeparator());
+        builder.append("/**").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" * Subclass used to not have to modify the generated code.").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" *").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" * @author sbegaudeau").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(" */").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append("public class " + GapPatternGenerator.toUpperFirst(eClass.getName()) + "ItemProviderSpec extends " + GapPatternGenerator.toUpperFirst(eClass.getName()) + "ItemProvider {") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                .append(System.lineSeparator());
+        builder.append(System.lineSeparator());
+        builder.append("    /**").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append("     * The constructor.").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append("     *").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append("     * @param adapterFactory").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append("     *            The adapter factory").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append("     */").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append("    public " + GapPatternGenerator.toUpperFirst(eClass.getName()) + "ItemProviderSpec(AdapterFactory adapterFactory) {").append(System.lineSeparator()); //$NON-NLS-1$ //$NON-NLS-2$
+        builder.append("        super(adapterFactory);").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append("    }").append(System.lineSeparator()); //$NON-NLS-1$
+        builder.append(System.lineSeparator());
+        builder.append("}").append(System.lineSeparator()); //$NON-NLS-1$
+
+        String className = GapPatternGenerator.toUpperFirst(eClass.getName()) + "ItemProviderSpec.java"; //$NON-NLS-1$
+        Path outputFilePath = outputFolderPath.resolve(className);
+
+        GapPatternGenerator.writeSourceFile(outputFilePath, builder, false);
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..ebbb46041b
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProviderSpec.java
@@ -0,0 +1,58 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.ButtonWidgetConditionalStyle;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class ButtonDescriptionItemProviderSpec extends ButtonDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public ButtonDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((ButtonDescription) object).getLabelExpression();
+        return label == null || label.length() == 0 ? getString("_UI_ButtonDescription_type") : //$NON-NLS-1$
+                label;
+    }
+
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.BUTTON_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.BUTTON_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createButtonWidgetStyle()));
+
+        ButtonWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createButtonWidgetConditionalStyle();
+        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createButtonWidgetStyle());
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.BUTTON_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ButtonWidgetConditionalStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ButtonWidgetConditionalStyleItemProviderSpec.java
new file mode 100644
index 0000000000..c9fab10a58
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ButtonWidgetConditionalStyleItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.ButtonWidgetConditionalStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class ButtonWidgetConditionalStyleItemProviderSpec extends ButtonWidgetConditionalStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public ButtonWidgetConditionalStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((ButtonWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_ButtonWidgetConditionalStyle_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ButtonWidgetStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ButtonWidgetStyleItemProviderSpec.java
new file mode 100644
index 0000000000..4afb7021a0
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ButtonWidgetStyleItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.ButtonWidgetStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class ButtonWidgetStyleItemProviderSpec extends ButtonWidgetStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public ButtonWidgetStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((ButtonWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_ButtonWidgetStyle_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..96eebe06e4
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProviderSpec.java
@@ -0,0 +1,57 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class CheckboxDescriptionItemProviderSpec extends CheckboxDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public CheckboxDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((CheckboxDescription) object).getLabelExpression();
+        return label == null || label.length() == 0 ? getString("_UI_CheckboxDescription_type") : //$NON-NLS-1$
+                label;
+    }
+
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createCheckboxWidgetStyle()));
+
+        CheckboxWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createCheckboxWidgetConditionalStyle();
+        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createCheckboxWidgetStyle());
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CheckboxWidgetConditionalStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CheckboxWidgetConditionalStyleItemProviderSpec.java
new file mode 100644
index 0000000000..4c1b85c7b5
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CheckboxWidgetConditionalStyleItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.CheckboxWidgetConditionalStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class CheckboxWidgetConditionalStyleItemProviderSpec extends CheckboxWidgetConditionalStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public CheckboxWidgetConditionalStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((CheckboxWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_CheckboxWidgetConditionalStyle_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CheckboxWidgetStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CheckboxWidgetStyleItemProviderSpec.java
new file mode 100644
index 0000000000..7c595ee505
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CheckboxWidgetStyleItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.CheckboxWidgetStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class CheckboxWidgetStyleItemProviderSpec extends CheckboxWidgetStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public CheckboxWidgetStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((CheckboxWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_CheckboxWidgetStyle_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..062f247efc
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProviderSpec.java
@@ -0,0 +1,78 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.ContainerDescription;
+import org.eclipse.sirius.properties.DynamicMappingFor;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class ContainerDescriptionItemProviderSpec extends ContainerDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public ContainerDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((ContainerDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_ContainerDescription_type") : //$NON-NLS-1$
+                label;
+    }
+
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createContainerDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createTextDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createButtonDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createLabelDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createCheckboxDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createSelectDescription()));
+
+        DynamicMappingFor dynamicFor = PropertiesFactory.eINSTANCE.createDynamicMappingFor();
+        dynamicFor.getIfs().add(PropertiesFactory.eINSTANCE.createDynamicMappingIf());
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, dynamicFor));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createTextAreaDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createRadioDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createListDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createCustomDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createHyperlinkDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__LAYOUT, PropertiesFactory.eINSTANCE.createFillLayoutDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__LAYOUT, PropertiesFactory.eINSTANCE.createGridLayoutDescription()));
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ControlDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ControlDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..5d3ec5896e
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ControlDescriptionItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.ControlDescription;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class ControlDescriptionItemProviderSpec extends ControlDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public ControlDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((ControlDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_ControlDescription_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..a2686daa8c
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomDescriptionItemProviderSpec.java
@@ -0,0 +1,58 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.CustomDescription;
+import org.eclipse.sirius.properties.CustomWidgetConditionalStyle;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class CustomDescriptionItemProviderSpec extends CustomDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public CustomDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((CustomDescription) object).getLabelExpression();
+        return label == null || label.length() == 0 ? getString("_UI_CustomDescription_type") : //$NON-NLS-1$
+                label;
+    }
+
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        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()));
+
+        CustomWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createCustomWidgetConditionalStyle();
+        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createCustomWidgetStyle());
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CUSTOM_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomExpressionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomExpressionItemProviderSpec.java
new file mode 100644
index 0000000000..6020379506
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomExpressionItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.CustomExpression;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class CustomExpressionItemProviderSpec extends CustomExpressionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public CustomExpressionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((CustomExpression) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_CustomExpression_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomOperationItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomOperationItemProviderSpec.java
new file mode 100644
index 0000000000..a72521960c
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomOperationItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.CustomOperation;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class CustomOperationItemProviderSpec extends CustomOperationItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public CustomOperationItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((CustomOperation) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_CustomOperation_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomWidgetConditionalStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomWidgetConditionalStyleItemProviderSpec.java
new file mode 100644
index 0000000000..997e301e38
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomWidgetConditionalStyleItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.CustomWidgetConditionalStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class CustomWidgetConditionalStyleItemProviderSpec extends CustomWidgetConditionalStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public CustomWidgetConditionalStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((CustomWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_CustomWidgetConditionalStyle_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomWidgetStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomWidgetStyleItemProviderSpec.java
new file mode 100644
index 0000000000..9231c761d3
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/CustomWidgetStyleItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.CustomWidgetStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class CustomWidgetStyleItemProviderSpec extends CustomWidgetStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public CustomWidgetStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((CustomWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_CustomWidgetStyle_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/DescriptionChildCreationExtenderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/DescriptionChildCreationExtenderSpec.java
new file mode 100644
index 0000000000..05266f66cc
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/DescriptionChildCreationExtenderSpec.java
@@ -0,0 +1,80 @@
+/**
+ * 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.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.sirius.properties.GroupDescription;
+import org.eclipse.sirius.properties.PageDescription;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.ViewExtensionDescription;
+import org.eclipse.sirius.properties.provider.PropertiesItemProviderAdapterFactory.DescriptionChildCreationExtender;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.description.Group;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class DescriptionChildCreationExtenderSpec extends DescriptionChildCreationExtender {
+
+    /**
+     * Subclass used to not have to modify the generated code.
+     * 
+     * @author sbegaudeau
+     */
+    protected static class CreationSwitchSpec extends CreationSwitch {
+        /**
+         * The constructor.
+         * 
+         * @param newChildDescriptors
+         *            The new child descriptors
+         * @param editingDomain
+         *            The editing domain
+         */
+        CreationSwitchSpec(List<Object> newChildDescriptors, EditingDomain editingDomain) {
+            super(newChildDescriptors, editingDomain);
+        }
+
+        @Override
+        public Object caseGroup(Group object) {
+            ViewExtensionDescription ved = PropertiesFactory.eINSTANCE.createViewExtensionDescription();
+            ved.setIdentifier("Properties"); //$NON-NLS-1$
+            PageDescription page = PropertiesFactory.eINSTANCE.createPageDescription();
+            page.setIdentifier("Default"); //$NON-NLS-1$
+            page.setLabelExpression("Page"); //$NON-NLS-1$
+            page.setSemanticCandidateExpression(ViewExtensionDescriptionItemProvider.DEFAULT_SEMANTIC_CANDIDATES_EXPRESSION);
+            ved.getPages().add(page);
+            GroupDescription group = PropertiesFactory.eINSTANCE.createGroupDescription();
+            group.setIdentifier("Default"); //$NON-NLS-1$
+            group.setLabelExpression("Group"); //$NON-NLS-1$
+            group.setSemanticCandidateExpression(ViewExtensionDescriptionItemProvider.DEFAULT_SEMANTIC_CANDIDATES_EXPRESSION);
+            ved.getGroups().add(group);
+            page.getGroups().add(group);
+            newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.GROUP__EXTENSIONS, ved));
+            return null;
+        }
+
+    }
+
+    @Override
+    public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
+        ArrayList<Object> result = new ArrayList<Object>();
+        new CreationSwitchSpec(result, editingDomain).doSwitch((EObject) object);
+        return result;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/DynamicMappingForItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/DynamicMappingForItemProviderSpec.java
new file mode 100644
index 0000000000..ccc1fe29c1
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/DynamicMappingForItemProviderSpec.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.provider;
+
+import java.text.MessageFormat;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.DynamicMappingFor;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class DynamicMappingForItemProviderSpec extends DynamicMappingForItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public DynamicMappingForItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        DynamicMappingFor element = (DynamicMappingFor) object;
+        String label = MessageFormat.format("for {0} in {1}", element.getIterator(), element.getIterableExpression()); //$NON-NLS-1$
+        return label == null || label.length() == 0 ? getString("_UI_DynamicMappingFor_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProviderSpec.java
new file mode 100644
index 0000000000..88a4f0c9f9
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/DynamicMappingIfItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.DynamicMappingIf;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class DynamicMappingIfItemProviderSpec extends DynamicMappingIfItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public DynamicMappingIfItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((DynamicMappingIf) object).getPredicateExpression();
+        return label == null || label.length() == 0 ? getString("_UI_DynamicMappingIf_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/EditSupportItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/EditSupportItemProviderSpec.java
new file mode 100644
index 0000000000..caf052cf20
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/EditSupportItemProviderSpec.java
@@ -0,0 +1,33 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class EditSupportItemProviderSpec extends EditSupportItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public EditSupportItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/FillLayoutDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/FillLayoutDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..b807a7c038
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/FillLayoutDescriptionItemProviderSpec.java
@@ -0,0 +1,53 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.FILL_LAYOUT_ORIENTATION;
+import org.eclipse.sirius.properties.FillLayoutDescription;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class FillLayoutDescriptionItemProviderSpec extends FillLayoutDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public FillLayoutDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public Object getImage(Object object) {
+        FILL_LAYOUT_ORIENTATION labelValue = ((FillLayoutDescription) object).getOrientation();
+        if (labelValue == FILL_LAYOUT_ORIENTATION.HORIZONTAL) {
+            return overlayImage(object, getResourceLocator().getImage("full/obj16/FillLayoutDescriptionHorizontal")); //$NON-NLS-1$
+        } else {
+            return overlayImage(object, getResourceLocator().getImage("full/obj16/FillLayoutDescriptionVertical")); //$NON-NLS-1$
+        }
+    }
+
+    @Override
+    public String getText(Object object) {
+        FILL_LAYOUT_ORIENTATION labelValue = ((FillLayoutDescription) object).getOrientation();
+        String label = labelValue == null ? null : labelValue.toString();
+        return label == null || label.length() == 0 ? getString("_UI_FillLayoutDescription_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GridLayoutDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GridLayoutDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..1a84a82f59
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GridLayoutDescriptionItemProviderSpec.java
@@ -0,0 +1,33 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class GridLayoutDescriptionItemProviderSpec extends GridLayoutDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public GridLayoutDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GroupConditionalStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GroupConditionalStyleItemProviderSpec.java
new file mode 100644
index 0000000000..a42224db1e
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GroupConditionalStyleItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.GroupConditionalStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class GroupConditionalStyleItemProviderSpec extends GroupConditionalStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public GroupConditionalStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((GroupConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_GroupConditionalStyle_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GroupDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GroupDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..3248a489ec
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GroupDescriptionItemProviderSpec.java
@@ -0,0 +1,84 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.DynamicMappingFor;
+import org.eclipse.sirius.properties.GroupConditionalStyle;
+import org.eclipse.sirius.properties.GroupDescription;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class GroupDescriptionItemProviderSpec extends GroupDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public GroupDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((GroupDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_GroupDescription_type") : //$NON-NLS-1$
+                label;
+    }
+
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createContainerDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createTextDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createButtonDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createLabelDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createCheckboxDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createSelectDescription()));
+
+        DynamicMappingFor dynamicFor = PropertiesFactory.eINSTANCE.createDynamicMappingFor();
+        dynamicFor.getIfs().add(PropertiesFactory.eINSTANCE.createDynamicMappingIf());
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, dynamicFor));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createTextAreaDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createListDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createRadioDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createCustomDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTROLS, PropertiesFactory.eINSTANCE.createHyperlinkDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__VALIDATION_SET, PropertiesFactory.eINSTANCE.createGroupValidationSetDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createGroupStyle()));
+
+        GroupConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createGroupConditionalStyle();
+        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createGroupStyle());
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GroupStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GroupStyleItemProviderSpec.java
new file mode 100644
index 0000000000..da9357e9de
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GroupStyleItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.GroupStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class GroupStyleItemProviderSpec extends GroupStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public GroupStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((GroupStyle) object).getFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_GroupStyle_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..21389461de
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/GroupValidationSetDescriptionItemProviderSpec.java
@@ -0,0 +1,33 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class GroupValidationSetDescriptionItemProviderSpec extends GroupValidationSetDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public GroupValidationSetDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/HyperlinkDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/HyperlinkDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..f02e7d0ca9
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/HyperlinkDescriptionItemProviderSpec.java
@@ -0,0 +1,59 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.HyperlinkDescription;
+import org.eclipse.sirius.properties.HyperlinkWidgetConditionalStyle;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class HyperlinkDescriptionItemProviderSpec extends HyperlinkDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public HyperlinkDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((HyperlinkDescription) object).getLabelExpression();
+        return label == null || label.length() == 0 ? getString("_UI_HyperlinkDescription_type") : //$NON-NLS-1$
+                label;
+    }
+
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.HYPERLINK_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.HYPERLINK_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createHyperlinkWidgetStyle()));
+
+        HyperlinkWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createHyperlinkWidgetConditionalStyle();
+        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createHyperlinkWidgetStyle());
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.HYPERLINK_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.HYPERLINK_DESCRIPTION__ACTIONS, PropertiesFactory.eINSTANCE.createWidgetAction()));
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/HyperlinkWidgetConditionalStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/HyperlinkWidgetConditionalStyleItemProviderSpec.java
new file mode 100644
index 0000000000..405c8032df
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/HyperlinkWidgetConditionalStyleItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.HyperlinkWidgetConditionalStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class HyperlinkWidgetConditionalStyleItemProviderSpec extends HyperlinkWidgetConditionalStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public HyperlinkWidgetConditionalStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((HyperlinkWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_HyperlinkWidgetConditionalStyle_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/HyperlinkWidgetStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/HyperlinkWidgetStyleItemProviderSpec.java
new file mode 100644
index 0000000000..3483b0608b
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/HyperlinkWidgetStyleItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.HyperlinkWidgetStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class HyperlinkWidgetStyleItemProviderSpec extends HyperlinkWidgetStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public HyperlinkWidgetStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((HyperlinkWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_HyperlinkWidgetStyle_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/LabelDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/LabelDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..58e305578a
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/LabelDescriptionItemProviderSpec.java
@@ -0,0 +1,56 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.LabelDescription;
+import org.eclipse.sirius.properties.LabelWidgetConditionalStyle;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class LabelDescriptionItemProviderSpec extends LabelDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public LabelDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((LabelDescription) object).getLabelExpression();
+        return label == null || label.length() == 0 ? getString("_UI_LabelDescription_type") : //$NON-NLS-1$
+                label;
+    }
+
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.LABEL_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createLabelWidgetStyle()));
+
+        LabelWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createLabelWidgetConditionalStyle();
+        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createLabelWidgetStyle());
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.LABEL_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.LABEL_DESCRIPTION__ACTIONS, PropertiesFactory.eINSTANCE.createWidgetAction()));
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/LabelWidgetConditionalStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/LabelWidgetConditionalStyleItemProviderSpec.java
new file mode 100644
index 0000000000..393bd55997
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/LabelWidgetConditionalStyleItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.LabelWidgetConditionalStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class LabelWidgetConditionalStyleItemProviderSpec extends LabelWidgetConditionalStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public LabelWidgetConditionalStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((LabelWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_LabelWidgetConditionalStyle_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/LabelWidgetStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/LabelWidgetStyleItemProviderSpec.java
new file mode 100644
index 0000000000..dbf5e49dc6
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/LabelWidgetStyleItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.LabelWidgetStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class LabelWidgetStyleItemProviderSpec extends LabelWidgetStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public LabelWidgetStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((LabelWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_LabelWidgetStyle_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/LayoutDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/LayoutDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..b0be92224a
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/LayoutDescriptionItemProviderSpec.java
@@ -0,0 +1,33 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class LayoutDescriptionItemProviderSpec extends LayoutDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public LayoutDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ListDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ListDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..93e91d0e14
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ListDescriptionItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.ListDescription;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class ListDescriptionItemProviderSpec extends ListDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public ListDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((ListDescription) object).getLabelExpression();
+        return label == null || label.length() == 0 ? getString("_UI_ListDescription_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ListWidgetConditionalStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ListWidgetConditionalStyleItemProviderSpec.java
new file mode 100644
index 0000000000..a78bf9d5a1
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ListWidgetConditionalStyleItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.ListWidgetConditionalStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class ListWidgetConditionalStyleItemProviderSpec extends ListWidgetConditionalStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public ListWidgetConditionalStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((ListWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_ListWidgetConditionalStyle_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ListWidgetStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ListWidgetStyleItemProviderSpec.java
new file mode 100644
index 0000000000..6b848764b1
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ListWidgetStyleItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.ListWidgetStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class ListWidgetStyleItemProviderSpec extends ListWidgetStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public ListWidgetStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((ListWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_ListWidgetStyle_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/OperationDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/OperationDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..7954d0686d
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/OperationDescriptionItemProviderSpec.java
@@ -0,0 +1,33 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class OperationDescriptionItemProviderSpec extends OperationDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public OperationDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/PageDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/PageDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..49e2613bda
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/PageDescriptionItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.PageDescription;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class PageDescriptionItemProviderSpec extends PageDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public PageDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((PageDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_PageDescription_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..f5419077c2
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/PageValidationSetDescriptionItemProviderSpec.java
@@ -0,0 +1,33 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class PageValidationSetDescriptionItemProviderSpec extends PageValidationSetDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public PageValidationSetDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactorySpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactorySpec.java
new file mode 100644
index 0000000000..0ea17402e6
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactorySpec.java
@@ -0,0 +1,445 @@
+/**
+ * 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 org.eclipse.emf.common.notify.Adapter;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class PropertiesItemProviderAdapterFactorySpec extends PropertiesItemProviderAdapterFactory {
+
+    @Override
+    public Adapter createViewExtensionDescriptionAdapter() {
+        if (viewExtensionDescriptionItemProvider == null) {
+            viewExtensionDescriptionItemProvider = new ViewExtensionDescriptionItemProviderSpec(this);
+        }
+
+        return viewExtensionDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createPageDescriptionAdapter() {
+        if (pageDescriptionItemProvider == null) {
+            pageDescriptionItemProvider = new PageDescriptionItemProviderSpec(this);
+        }
+
+        return pageDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createPageValidationSetDescriptionAdapter() {
+        if (pageValidationSetDescriptionItemProvider == null) {
+            pageValidationSetDescriptionItemProvider = new PageValidationSetDescriptionItemProviderSpec(this);
+        }
+
+        return pageValidationSetDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createPropertyValidationRuleAdapter() {
+        if (propertyValidationRuleItemProvider == null) {
+            propertyValidationRuleItemProvider = new PropertyValidationRuleItemProviderSpec(this);
+        }
+
+        return propertyValidationRuleItemProvider;
+    }
+
+    @Override
+    public Adapter createGroupDescriptionAdapter() {
+        if (groupDescriptionItemProvider == null) {
+            groupDescriptionItemProvider = new GroupDescriptionItemProviderSpec(this);
+        }
+
+        return groupDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createGroupValidationSetDescriptionAdapter() {
+        if (groupValidationSetDescriptionItemProvider == null) {
+            groupValidationSetDescriptionItemProvider = new GroupValidationSetDescriptionItemProviderSpec(this);
+        }
+
+        return groupValidationSetDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createContainerDescriptionAdapter() {
+        if (containerDescriptionItemProvider == null) {
+            containerDescriptionItemProvider = new ContainerDescriptionItemProviderSpec(this);
+        }
+
+        return containerDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createFillLayoutDescriptionAdapter() {
+        if (fillLayoutDescriptionItemProvider == null) {
+            fillLayoutDescriptionItemProvider = new FillLayoutDescriptionItemProviderSpec(this);
+        }
+
+        return fillLayoutDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createGridLayoutDescriptionAdapter() {
+        if (gridLayoutDescriptionItemProvider == null) {
+            gridLayoutDescriptionItemProvider = new GridLayoutDescriptionItemProviderSpec(this);
+        }
+
+        return gridLayoutDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createTextDescriptionAdapter() {
+        if (textDescriptionItemProvider == null) {
+            textDescriptionItemProvider = new TextDescriptionItemProviderSpec(this);
+        }
+
+        return textDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createButtonDescriptionAdapter() {
+        if (buttonDescriptionItemProvider == null) {
+            buttonDescriptionItemProvider = new ButtonDescriptionItemProviderSpec(this);
+        }
+
+        return buttonDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createLabelDescriptionAdapter() {
+        if (labelDescriptionItemProvider == null) {
+            labelDescriptionItemProvider = new LabelDescriptionItemProviderSpec(this);
+        }
+
+        return labelDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createCheckboxDescriptionAdapter() {
+        if (checkboxDescriptionItemProvider == null) {
+            checkboxDescriptionItemProvider = new CheckboxDescriptionItemProviderSpec(this);
+        }
+
+        return checkboxDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createSelectDescriptionAdapter() {
+        if (selectDescriptionItemProvider == null) {
+            selectDescriptionItemProvider = new SelectDescriptionItemProviderSpec(this);
+        }
+
+        return selectDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createDynamicMappingForAdapter() {
+        if (dynamicMappingForItemProvider == null) {
+            dynamicMappingForItemProvider = new DynamicMappingForItemProviderSpec(this);
+        }
+
+        return dynamicMappingForItemProvider;
+    }
+
+    @Override
+    public Adapter createDynamicMappingIfAdapter() {
+        if (dynamicMappingIfItemProvider == null) {
+            dynamicMappingIfItemProvider = new DynamicMappingIfItemProviderSpec(this);
+        }
+
+        return dynamicMappingIfItemProvider;
+    }
+
+    @Override
+    public Adapter createTextAreaDescriptionAdapter() {
+        if (textAreaDescriptionItemProvider == null) {
+            textAreaDescriptionItemProvider = new TextAreaDescriptionItemProviderSpec(this);
+        }
+
+        return textAreaDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createRadioDescriptionAdapter() {
+        if (radioDescriptionItemProvider == null) {
+            radioDescriptionItemProvider = new RadioDescriptionItemProviderSpec(this);
+        }
+
+        return radioDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createListDescriptionAdapter() {
+        if (listDescriptionItemProvider == null) {
+            listDescriptionItemProvider = new ListDescriptionItemProviderSpec(this);
+        }
+
+        return listDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createOperationDescriptionAdapter() {
+        if (operationDescriptionItemProvider == null) {
+            operationDescriptionItemProvider = new OperationDescriptionItemProviderSpec(this);
+        }
+
+        return operationDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createCustomDescriptionAdapter() {
+        if (customDescriptionItemProvider == null) {
+            customDescriptionItemProvider = new CustomDescriptionItemProviderSpec(this);
+        }
+
+        return customDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createCustomExpressionAdapter() {
+        if (customExpressionItemProvider == null) {
+            customExpressionItemProvider = new CustomExpressionItemProviderSpec(this);
+        }
+
+        return customExpressionItemProvider;
+    }
+
+    @Override
+    public Adapter createCustomOperationAdapter() {
+        if (customOperationItemProvider == null) {
+            customOperationItemProvider = new CustomOperationItemProviderSpec(this);
+        }
+
+        return customOperationItemProvider;
+    }
+
+    @Override
+    public Adapter createHyperlinkDescriptionAdapter() {
+        if (hyperlinkDescriptionItemProvider == null) {
+            hyperlinkDescriptionItemProvider = new HyperlinkDescriptionItemProviderSpec(this);
+        }
+
+        return hyperlinkDescriptionItemProvider;
+    }
+
+    @Override
+    public Adapter createWidgetStyleAdapter() {
+        if (widgetStyleItemProvider == null) {
+            widgetStyleItemProvider = new WidgetStyleItemProviderSpec(this);
+        }
+
+        return widgetStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createTextWidgetStyleAdapter() {
+        if (textWidgetStyleItemProvider == null) {
+            textWidgetStyleItemProvider = new TextWidgetStyleItemProviderSpec(this);
+        }
+
+        return textWidgetStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createLabelWidgetStyleAdapter() {
+        if (labelWidgetStyleItemProvider == null) {
+            labelWidgetStyleItemProvider = new LabelWidgetStyleItemProviderSpec(this);
+        }
+
+        return labelWidgetStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createCheckboxWidgetStyleAdapter() {
+        if (checkboxWidgetStyleItemProvider == null) {
+            checkboxWidgetStyleItemProvider = new CheckboxWidgetStyleItemProviderSpec(this);
+        }
+
+        return checkboxWidgetStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createRadioWidgetStyleAdapter() {
+        if (radioWidgetStyleItemProvider == null) {
+            radioWidgetStyleItemProvider = new RadioWidgetStyleItemProviderSpec(this);
+        }
+
+        return radioWidgetStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createButtonWidgetStyleAdapter() {
+        if (buttonWidgetStyleItemProvider == null) {
+            buttonWidgetStyleItemProvider = new ButtonWidgetStyleItemProviderSpec(this);
+        }
+
+        return buttonWidgetStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createSelectWidgetStyleAdapter() {
+        if (selectWidgetStyleItemProvider == null) {
+            selectWidgetStyleItemProvider = new SelectWidgetStyleItemProviderSpec(this);
+        }
+
+        return selectWidgetStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createCustomWidgetStyleAdapter() {
+        if (customWidgetStyleItemProvider == null) {
+            customWidgetStyleItemProvider = new CustomWidgetStyleItemProviderSpec(this);
+        }
+
+        return customWidgetStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createListWidgetStyleAdapter() {
+        if (listWidgetStyleItemProvider == null) {
+            listWidgetStyleItemProvider = new ListWidgetStyleItemProviderSpec(this);
+        }
+
+        return listWidgetStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createHyperlinkWidgetStyleAdapter() {
+        if (hyperlinkWidgetStyleItemProvider == null) {
+            hyperlinkWidgetStyleItemProvider = new HyperlinkWidgetStyleItemProviderSpec(this);
+        }
+
+        return hyperlinkWidgetStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createGroupStyleAdapter() {
+        if (groupStyleItemProvider == null) {
+            groupStyleItemProvider = new GroupStyleItemProviderSpec(this);
+        }
+
+        return groupStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createTextWidgetConditionalStyleAdapter() {
+        if (textWidgetConditionalStyleItemProvider == null) {
+            textWidgetConditionalStyleItemProvider = new TextWidgetConditionalStyleItemProviderSpec(this);
+        }
+
+        return textWidgetConditionalStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createLabelWidgetConditionalStyleAdapter() {
+        if (labelWidgetConditionalStyleItemProvider == null) {
+            labelWidgetConditionalStyleItemProvider = new LabelWidgetConditionalStyleItemProviderSpec(this);
+        }
+
+        return labelWidgetConditionalStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createCheckboxWidgetConditionalStyleAdapter() {
+        if (checkboxWidgetConditionalStyleItemProvider == null) {
+            checkboxWidgetConditionalStyleItemProvider = new CheckboxWidgetConditionalStyleItemProviderSpec(this);
+        }
+
+        return checkboxWidgetConditionalStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createRadioWidgetConditionalStyleAdapter() {
+        if (radioWidgetConditionalStyleItemProvider == null) {
+            radioWidgetConditionalStyleItemProvider = new RadioWidgetConditionalStyleItemProviderSpec(this);
+        }
+
+        return radioWidgetConditionalStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createButtonWidgetConditionalStyleAdapter() {
+        if (buttonWidgetConditionalStyleItemProvider == null) {
+            buttonWidgetConditionalStyleItemProvider = new ButtonWidgetConditionalStyleItemProviderSpec(this);
+        }
+
+        return buttonWidgetConditionalStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createSelectWidgetConditionalStyleAdapter() {
+        if (selectWidgetConditionalStyleItemProvider == null) {
+            selectWidgetConditionalStyleItemProvider = new SelectWidgetConditionalStyleItemProviderSpec(this);
+        }
+
+        return selectWidgetConditionalStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createCustomWidgetConditionalStyleAdapter() {
+        if (customWidgetConditionalStyleItemProvider == null) {
+            customWidgetConditionalStyleItemProvider = new CustomWidgetConditionalStyleItemProviderSpec(this);
+        }
+
+        return customWidgetConditionalStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createListWidgetConditionalStyleAdapter() {
+        if (listWidgetConditionalStyleItemProvider == null) {
+            listWidgetConditionalStyleItemProvider = new ListWidgetConditionalStyleItemProviderSpec(this);
+        }
+
+        return listWidgetConditionalStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createWidgetActionAdapter() {
+        if (widgetActionItemProvider == null) {
+            widgetActionItemProvider = new WidgetActionItemProviderSpec(this);
+        }
+
+        return widgetActionItemProvider;
+    }
+
+    @Override
+    public Adapter createHyperlinkWidgetConditionalStyleAdapter() {
+        if (hyperlinkWidgetConditionalStyleItemProvider == null) {
+            hyperlinkWidgetConditionalStyleItemProvider = new HyperlinkWidgetConditionalStyleItemProviderSpec(this);
+        }
+
+        return hyperlinkWidgetConditionalStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createGroupConditionalStyleAdapter() {
+        if (groupConditionalStyleItemProvider == null) {
+            groupConditionalStyleItemProvider = new GroupConditionalStyleItemProviderSpec(this);
+        }
+
+        return groupConditionalStyleItemProvider;
+    }
+
+    @Override
+    public Adapter createEditSupportAdapter() {
+        if (editSupportItemProvider == null) {
+            editSupportItemProvider = new EditSupportItemProviderSpec(this);
+        }
+
+        return editSupportItemProvider;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProviderSpec.java
new file mode 100644
index 0000000000..07faa51acd
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/PropertyValidationRuleItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.PropertyValidationRule;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class PropertyValidationRuleItemProviderSpec extends PropertyValidationRuleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public PropertyValidationRuleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((PropertyValidationRule) object).getName();
+        return label == null || label.length() == 0 ? getString("_UI_PropertyValidationRule_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/RadioDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/RadioDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..6f10e56591
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/RadioDescriptionItemProviderSpec.java
@@ -0,0 +1,57 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
+import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class RadioDescriptionItemProviderSpec extends RadioDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public RadioDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((RadioDescription) object).getLabelExpression();
+        return label == null || label.length() == 0 ? getString("_UI_RadioDescription_type") : //$NON-NLS-1$
+                label;
+    }
+
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.RADIO_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.RADIO_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createRadioWidgetStyle()));
+
+        RadioWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createRadioWidgetConditionalStyle();
+        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createRadioWidgetStyle());
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.RADIO_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/RadioWidgetConditionalStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/RadioWidgetConditionalStyleItemProviderSpec.java
new file mode 100644
index 0000000000..99d29329a5
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/RadioWidgetConditionalStyleItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.RadioWidgetConditionalStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class RadioWidgetConditionalStyleItemProviderSpec extends RadioWidgetConditionalStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public RadioWidgetConditionalStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((RadioWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_RadioWidgetConditionalStyle_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/RadioWidgetStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/RadioWidgetStyleItemProviderSpec.java
new file mode 100644
index 0000000000..d820d2b010
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/RadioWidgetStyleItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.RadioWidgetStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class RadioWidgetStyleItemProviderSpec extends RadioWidgetStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public RadioWidgetStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((RadioWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_RadioWidgetStyle_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/SelectDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/SelectDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..3ac30fa119
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/SelectDescriptionItemProviderSpec.java
@@ -0,0 +1,58 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
+import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class SelectDescriptionItemProviderSpec extends SelectDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public SelectDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((SelectDescription) object).getLabelExpression();
+        return label == null || label.length() == 0 ? getString("_UI_SelectDescription_type") : //$NON-NLS-1$
+                label;
+    }
+
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.SELECT_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.SELECT_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createSelectWidgetStyle()));
+
+        SelectWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createSelectWidgetConditionalStyle();
+        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createSelectWidgetStyle());
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.SELECT_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/SelectWidgetConditionalStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/SelectWidgetConditionalStyleItemProviderSpec.java
new file mode 100644
index 0000000000..1395abff84
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/SelectWidgetConditionalStyleItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.SelectWidgetConditionalStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class SelectWidgetConditionalStyleItemProviderSpec extends SelectWidgetConditionalStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public SelectWidgetConditionalStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((SelectWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_SelectWidgetConditionalStyle_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/SelectWidgetStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/SelectWidgetStyleItemProviderSpec.java
new file mode 100644
index 0000000000..67205edcb6
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/SelectWidgetStyleItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.SelectWidgetStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class SelectWidgetStyleItemProviderSpec extends SelectWidgetStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public SelectWidgetStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((SelectWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_SelectWidgetStyle_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..07650d3dc5
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.TextAreaDescription;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class TextAreaDescriptionItemProviderSpec extends TextAreaDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public TextAreaDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((TextAreaDescription) object).getLabelExpression();
+        return label == null || label.length() == 0 ? getString("_UI_TextAreaDescription_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/TextDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/TextDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..35e0b489de
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/TextDescriptionItemProviderSpec.java
@@ -0,0 +1,57 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.TextWidgetConditionalStyle;
+import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class TextDescriptionItemProviderSpec extends TextDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public TextDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((TextDescription) object).getLabelExpression();
+        return label == null || label.length() == 0 ? getString("_UI_TextDescription_type") : //$NON-NLS-1$
+                label;
+    }
+
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__STYLE, PropertiesFactory.eINSTANCE.createTextWidgetStyle()));
+
+        TextWidgetConditionalStyle conditionalStyle = PropertiesFactory.eINSTANCE.createTextWidgetConditionalStyle();
+        conditionalStyle.setStyle(PropertiesFactory.eINSTANCE.createTextWidgetStyle());
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__CONDITIONAL_STYLES, conditionalStyle));
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/TextWidgetConditionalStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/TextWidgetConditionalStyleItemProviderSpec.java
new file mode 100644
index 0000000000..72e693e440
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/TextWidgetConditionalStyleItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.TextWidgetConditionalStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class TextWidgetConditionalStyleItemProviderSpec extends TextWidgetConditionalStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public TextWidgetConditionalStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((TextWidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_TextWidgetConditionalStyle_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/TextWidgetStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/TextWidgetStyleItemProviderSpec.java
new file mode 100644
index 0000000000..ce69ff6a04
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/TextWidgetStyleItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.TextWidgetStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class TextWidgetStyleItemProviderSpec extends TextWidgetStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public TextWidgetStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((TextWidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_TextWidgetStyle_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ValidationChildCreationExtenderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ValidationChildCreationExtenderSpec.java
new file mode 100644
index 0000000000..f6e580db22
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ValidationChildCreationExtenderSpec.java
@@ -0,0 +1,22 @@
+/**
+ * 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 org.eclipse.sirius.properties.provider.PropertiesItemProviderAdapterFactory.ValidationChildCreationExtender;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class ValidationChildCreationExtenderSpec extends ValidationChildCreationExtender {
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..44bd52e476
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProviderSpec.java
@@ -0,0 +1,59 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.GroupDescription;
+import org.eclipse.sirius.properties.PageDescription;
+import org.eclipse.sirius.properties.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.ViewExtensionDescription;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class ViewExtensionDescriptionItemProviderSpec extends ViewExtensionDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public ViewExtensionDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((ViewExtensionDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_ViewExtensionDescription_type") : //$NON-NLS-1$
+                label;
+    }
+
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        PageDescription page = PropertiesFactory.eINSTANCE.createPageDescription();
+        page.setLabelExpression("Page"); //$NON-NLS-1$
+        page.setSemanticCandidateExpression(ViewExtensionDescriptionItemProvider.DEFAULT_SEMANTIC_CANDIDATES_EXPRESSION);
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__PAGES, page));
+
+        GroupDescription group = PropertiesFactory.eINSTANCE.createGroupDescription();
+        group.setLabelExpression("Group"); //$NON-NLS-1$
+        group.setSemanticCandidateExpression(ViewExtensionDescriptionItemProvider.DEFAULT_SEMANTIC_CANDIDATES_EXPRESSION);
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__GROUPS, group));
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/WidgetActionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/WidgetActionItemProviderSpec.java
new file mode 100644
index 0000000000..1a029e5e02
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/WidgetActionItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.WidgetAction;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class WidgetActionItemProviderSpec extends WidgetActionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public WidgetActionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((WidgetAction) object).getLabelExpression();
+        return label == null || label.length() == 0 ? getString("_UI_WidgetAction_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/WidgetConditionalStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/WidgetConditionalStyleItemProviderSpec.java
new file mode 100644
index 0000000000..d231dd29c6
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/WidgetConditionalStyleItemProviderSpec.java
@@ -0,0 +1,41 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.WidgetConditionalStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class WidgetConditionalStyleItemProviderSpec extends WidgetConditionalStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public WidgetConditionalStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((WidgetConditionalStyle) object).getPreconditionExpression();
+        return label == null || label.length() == 0 ? getString("_UI_WidgetConditionalStyle_type") : //$NON-NLS-1$
+                label;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProviderSpec.java
new file mode 100644
index 0000000000..a815659d2d
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.WidgetDescription;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class WidgetDescriptionItemProviderSpec extends WidgetDescriptionItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public WidgetDescriptionItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((WidgetDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_WidgetDescription_type") : //$NON-NLS-1$
+                label;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/WidgetStyleItemProviderSpec.java b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/WidgetStyleItemProviderSpec.java
new file mode 100644
index 0000000000..b0784ed082
--- /dev/null
+++ b/plugins/org.eclipse.sirius.properties.edit/src-spec/org/eclipse/sirius/properties/provider/WidgetStyleItemProviderSpec.java
@@ -0,0 +1,40 @@
+/**
+ * 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 org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.sirius.properties.WidgetStyle;
+
+/**
+ * Subclass used to not have to modify the generated code.
+ *
+ * @author sbegaudeau
+ */
+public class WidgetStyleItemProviderSpec extends WidgetStyleItemProvider {
+
+    /**
+     * The constructor.
+     *
+     * @param adapterFactory
+     *            The adapter factory
+     */
+    public WidgetStyleItemProviderSpec(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    @Override
+    public String getText(Object object) {
+        String label = ((WidgetStyle) object).getLabelFontNameExpression();
+        return label == null || label.length() == 0 ? getString("_UI_WidgetStyle_type") : //$NON-NLS-1$
+                label;
+    }
+}