[482528] Contribute radio description to the view extension description

A new RadioDescription is defined in properties.ecore. The RadioDescription is a new kind of widget which describes a radio in the properties view. Bug: 482528 Change-Id: I805afb7fd6284a75cf03d99e0f3654625b5238be Signed-off-by: Mélanie Bats <melanie.bats@obeo.fr>
author: Mélanie Bats 2016-02-02 16:24:53 +0000
committer: Pierre-Charles David 2016-02-16 14:28:56 +0000
commit: bd3aa22374d12a28b0f4c535caa0a669e0dba9fc (patch)
tree: 92e8d60d5aa736b0f0ad3004beff14889033a262
parent: 7385dbd097916fb48f32f30626d1b0a20d46dc42 (diff)
download: org.eclipse.sirius-bd3aa22374d12a28b0f4c535caa0a669e0dba9fc.tar.gz
org.eclipse.sirius-bd3aa22374d12a28b0f4c535caa0a669e0dba9fc.tar.xz
org.eclipse.sirius-bd3aa22374d12a28b0f4c535caa0a669e0dba9fc.zip
128 files changed, 3374 insertions, 828 deletions
diff --git a/incubation/org.eclipse.sirius.editor.properties/.classpath b/incubation/org.eclipse.sirius.editor.properties/.classpath
index 26e67d64ad..52bfdf17a0 100644
--- a/incubation/org.eclipse.sirius.editor.properties/.classpath
+++ b/incubation/org.eclipse.sirius.editor.properties/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/incubation/org.eclipse.sirius.editor.properties/.settings/org.eclipse.jdt.core.prefs b/incubation/org.eclipse.sirius.editor.properties/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..d17b6724d1 100644
--- a/incubation/org.eclipse.sirius.editor.properties/.settings/org.eclipse.jdt.core.prefs
+++ b/incubation/org.eclipse.sirius.editor.properties/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+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
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml b/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
index ed2d8324f6..1528f9e6d4 100644
--- a/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
+++ b/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
@@ -156,4 +156,16 @@
    
       </description>
    </context>
+   <context id="RadioDescription">
+     <description>
+       Represents a radio button in the user interface.
+
+       
+         
+   <!-- Start of user code RadioDescription description -->
+   
+   <!-- End of user code RadioDescription description -->
+   
+      </description>
+   </context>
 </contexts>
 \ No newline at end of file
diff --git a/incubation/org.eclipse.sirius.editor.properties/plugin.xml b/incubation/org.eclipse.sirius.editor.properties/plugin.xml
index 5e9b88395d..6dd6dbeac5 100644
--- a/incubation/org.eclipse.sirius.editor.properties/plugin.xml
+++ b/incubation/org.eclipse.sirius.editor.properties/plugin.xml
@@ -19,6 +19,29 @@
   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections">
     <propertySections contributorId="org.eclipse.sirius.editor.editorPlugin.SiriusEditorContributor">
   	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.radiodescription.RadioDescriptionCandidateDisplayExpressionPropertySection"
+               id="properties.section.radioDescription.CandidateDisplayExpression"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.radiodescription.RadioDescriptionCandidateDisplayExpressionFilter"
+               afterSection="properties.section.radioDescription.CandidatesExpression"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.RadioDescription"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.radiodescription.RadioDescriptionCandidatesExpressionPropertySection"
+               id="properties.section.radioDescription.CandidatesExpression"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.radiodescription.RadioDescriptionCandidatesExpressionFilter"
+               afterSection="properties.section.radioDescription.ValueExpression"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.RadioDescription"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.radiodescription.RadioDescriptionValueExpressionPropertySection"
+               id="properties.section.radioDescription.ValueExpression"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.radiodescription.RadioDescriptionValueExpressionFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.RadioDescription"/>
+      </propertySection>
+  	  <propertySection
                class="org.eclipse.sirius.properties.editor.properties.sections.properties.textareadescription.TextAreaDescriptionLineCountPropertySection"
                id="properties.section.textAreaDescription.LineCount"
                filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textareadescription.TextAreaDescriptionLineCountFilter"
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/buttondescription/ButtonDescriptionButtonLabelExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/buttondescription/ButtonDescriptionButtonLabelExpressionFilter.java
index d3fd2a0836..ab2dd0b947 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/buttondescription/ButtonDescriptionButtonLabelExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/buttondescription/ButtonDescriptionButtonLabelExpressionFilter.java
@@ -25,6 +25,7 @@ public class ButtonDescriptionButtonLabelExpressionFilter extends ViewpointPrope
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getButtonDescription_ButtonLabelExpression();
     }
@@ -32,6 +33,7 @@ public class ButtonDescriptionButtonLabelExpressionFilter extends ViewpointPrope
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.ButtonDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/checkboxdescription/CheckboxDescriptionValueExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/checkboxdescription/CheckboxDescriptionValueExpressionFilter.java
index be8d0f04cb..cab3f533e3 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/checkboxdescription/CheckboxDescriptionValueExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/checkboxdescription/CheckboxDescriptionValueExpressionFilter.java
@@ -25,6 +25,7 @@ public class CheckboxDescriptionValueExpressionFilter extends ViewpointPropertyF
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getCheckboxDescription_ValueExpression();
     }
@@ -32,6 +33,7 @@ public class CheckboxDescriptionValueExpressionFilter extends ViewpointPropertyF
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.CheckboxDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/containerdescription/ContainerDescriptionIdentifierFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/containerdescription/ContainerDescriptionIdentifierFilter.java
index e6d00ff941..f8c8a8b5e1 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/containerdescription/ContainerDescriptionIdentifierFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/containerdescription/ContainerDescriptionIdentifierFilter.java
@@ -25,6 +25,7 @@ public class ContainerDescriptionIdentifierFilter extends ViewpointPropertyFilte
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getContainerDescription_Identifier();
     }
@@ -32,6 +33,7 @@ public class ContainerDescriptionIdentifierFilter extends ViewpointPropertyFilte
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.ContainerDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingcase/DynamicMappingCaseCaseExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingcase/DynamicMappingCaseCaseExpressionFilter.java
index 93e8bbf6ae..e8244d5f6d 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingcase/DynamicMappingCaseCaseExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingcase/DynamicMappingCaseCaseExpressionFilter.java
@@ -25,6 +25,7 @@ public class DynamicMappingCaseCaseExpressionFilter extends ViewpointPropertyFil
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getDynamicMappingCase_CaseExpression();
     }
@@ -32,6 +33,7 @@ public class DynamicMappingCaseCaseExpressionFilter extends ViewpointPropertyFil
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.DynamicMappingCase;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionFilter.java
index baf5085dc3..39d9924709 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionFilter.java
@@ -25,6 +25,7 @@ public class DynamicMappingForDomainClassExpressionFilter extends ViewpointPrope
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getDynamicMappingFor_DomainClassExpression();
     }
@@ -32,6 +33,7 @@ public class DynamicMappingForDomainClassExpressionFilter extends ViewpointPrope
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.DynamicMappingFor;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingfor/DynamicMappingForIteratorFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingfor/DynamicMappingForIteratorFilter.java
index a75f1985d6..18a6680792 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingfor/DynamicMappingForIteratorFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingfor/DynamicMappingForIteratorFilter.java
@@ -25,6 +25,7 @@ public class DynamicMappingForIteratorFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getDynamicMappingFor_Iterator();
     }
@@ -32,6 +33,7 @@ public class DynamicMappingForIteratorFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.DynamicMappingFor;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingswitch/DynamicMappingSwitchSwitchExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingswitch/DynamicMappingSwitchSwitchExpressionFilter.java
index 5241681a04..b4c2f1651f 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingswitch/DynamicMappingSwitchSwitchExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/dynamicmappingswitch/DynamicMappingSwitchSwitchExpressionFilter.java
@@ -25,6 +25,7 @@ public class DynamicMappingSwitchSwitchExpressionFilter extends ViewpointPropert
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getDynamicMappingSwitch_SwitchExpression();
     }
@@ -32,6 +33,7 @@ public class DynamicMappingSwitchSwitchExpressionFilter extends ViewpointPropert
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.DynamicMappingSwitch;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionDomainClassFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionDomainClassFilter.java
index 037d2392e4..62cbb04ad0 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionDomainClassFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionDomainClassFilter.java
@@ -25,6 +25,7 @@ public class GroupDescriptionDomainClassFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getGroupDescription_DomainClass();
     }
@@ -32,6 +33,7 @@ public class GroupDescriptionDomainClassFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.GroupDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionIdentifierFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionIdentifierFilter.java
index dbbe782a03..a9aa54c644 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionIdentifierFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionIdentifierFilter.java
@@ -25,6 +25,7 @@ public class GroupDescriptionIdentifierFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getGroupDescription_Identifier();
     }
@@ -32,6 +33,7 @@ public class GroupDescriptionIdentifierFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.GroupDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionLabelExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionLabelExpressionFilter.java
index a6bf6ca03e..e8d642605e 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionLabelExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionLabelExpressionFilter.java
@@ -25,6 +25,7 @@ public class GroupDescriptionLabelExpressionFilter extends ViewpointPropertyFilt
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getGroupDescription_LabelExpression();
     }
@@ -32,6 +33,7 @@ public class GroupDescriptionLabelExpressionFilter extends ViewpointPropertyFilt
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.GroupDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionSemanticCandidateExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionSemanticCandidateExpressionFilter.java
index 7246fc023e..be8c42de7a 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionSemanticCandidateExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/groupdescription/GroupDescriptionSemanticCandidateExpressionFilter.java
@@ -25,6 +25,7 @@ public class GroupDescriptionSemanticCandidateExpressionFilter extends Viewpoint
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getGroupDescription_SemanticCandidateExpression();
     }
@@ -32,6 +33,7 @@ public class GroupDescriptionSemanticCandidateExpressionFilter extends Viewpoint
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.GroupDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionDomainClassFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionDomainClassFilter.java
index 8838748cf6..dd2f0f1da4 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionDomainClassFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionDomainClassFilter.java
@@ -25,6 +25,7 @@ public class PageDescriptionDomainClassFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getPageDescription_DomainClass();
     }
@@ -32,6 +33,7 @@ public class PageDescriptionDomainClassFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.PageDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionGroupsFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionGroupsFilter.java
index fb985bde92..1871a0db0b 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionGroupsFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionGroupsFilter.java
@@ -25,6 +25,7 @@ public class PageDescriptionGroupsFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getPageDescription_Groups();
     }
@@ -32,6 +33,7 @@ public class PageDescriptionGroupsFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.PageDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionIdentifierFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionIdentifierFilter.java
index c943166f7b..36ff27b538 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionIdentifierFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionIdentifierFilter.java
@@ -25,6 +25,7 @@ public class PageDescriptionIdentifierFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getPageDescription_Identifier();
     }
@@ -32,6 +33,7 @@ public class PageDescriptionIdentifierFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.PageDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionLabelExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionLabelExpressionFilter.java
index 6981e0b7ad..a1a99cac60 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionLabelExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionLabelExpressionFilter.java
@@ -25,6 +25,7 @@ public class PageDescriptionLabelExpressionFilter extends ViewpointPropertyFilte
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getPageDescription_LabelExpression();
     }
@@ -32,6 +33,7 @@ public class PageDescriptionLabelExpressionFilter extends ViewpointPropertyFilte
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.PageDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionSemanticCandidateExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionSemanticCandidateExpressionFilter.java
index 5e7395770a..91f5cea396 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionSemanticCandidateExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/pagedescription/PageDescriptionSemanticCandidateExpressionFilter.java
@@ -25,6 +25,7 @@ public class PageDescriptionSemanticCandidateExpressionFilter extends ViewpointP
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getPageDescription_SemanticCandidateExpression();
     }
@@ -32,6 +33,7 @@ public class PageDescriptionSemanticCandidateExpressionFilter extends ViewpointP
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.PageDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/radiodescription/RadioDescriptionCandidateDisplayExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/radiodescription/RadioDescriptionCandidateDisplayExpressionFilter.java
new file mode 100644
index 0000000000..5325fdff17
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/radiodescription/RadioDescriptionCandidateDisplayExpressionFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.filters.properties.radiodescription;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the candidateDisplayExpression property section.
+ */
+public class RadioDescriptionCandidateDisplayExpressionFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getRadioDescription_CandidateDisplayExpression();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.RadioDescription;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/radiodescription/RadioDescriptionCandidatesExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/radiodescription/RadioDescriptionCandidatesExpressionFilter.java
new file mode 100644
index 0000000000..4698b27289
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/radiodescription/RadioDescriptionCandidatesExpressionFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.filters.properties.radiodescription;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the candidatesExpression property section.
+ */
+public class RadioDescriptionCandidatesExpressionFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getRadioDescription_CandidatesExpression();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.RadioDescription;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/radiodescription/RadioDescriptionValueExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/radiodescription/RadioDescriptionValueExpressionFilter.java
new file mode 100644
index 0000000000..30eda50afd
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/radiodescription/RadioDescriptionValueExpressionFilter.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.filters.properties.radiodescription;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+import org.eclipse.sirius.properties.PropertiesPackage;
+
+// End of user code specific imports
+
+/**
+ * A filter for the valueExpression property section.
+ */
+public class RadioDescriptionValueExpressionFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getRadioDescription_ValueExpression();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.RadioDescription;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/selectdescription/SelectDescriptionCandidateDisplayExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/selectdescription/SelectDescriptionCandidateDisplayExpressionFilter.java
index d2d2285ec0..1df6cbd406 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/selectdescription/SelectDescriptionCandidateDisplayExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/selectdescription/SelectDescriptionCandidateDisplayExpressionFilter.java
@@ -25,6 +25,7 @@ public class SelectDescriptionCandidateDisplayExpressionFilter extends Viewpoint
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getSelectDescription_CandidateDisplayExpression();
     }
@@ -32,6 +33,7 @@ public class SelectDescriptionCandidateDisplayExpressionFilter extends Viewpoint
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.SelectDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/selectdescription/SelectDescriptionCandidatesExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/selectdescription/SelectDescriptionCandidatesExpressionFilter.java
index 6a68f97745..5a335ba077 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/selectdescription/SelectDescriptionCandidatesExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/selectdescription/SelectDescriptionCandidatesExpressionFilter.java
@@ -25,6 +25,7 @@ public class SelectDescriptionCandidatesExpressionFilter extends ViewpointProper
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getSelectDescription_CandidatesExpression();
     }
@@ -32,6 +33,7 @@ public class SelectDescriptionCandidatesExpressionFilter extends ViewpointProper
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.SelectDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/selectdescription/SelectDescriptionValueExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/selectdescription/SelectDescriptionValueExpressionFilter.java
index 1435c2c81a..63d1b09aee 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/selectdescription/SelectDescriptionValueExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/selectdescription/SelectDescriptionValueExpressionFilter.java
@@ -25,6 +25,7 @@ public class SelectDescriptionValueExpressionFilter extends ViewpointPropertyFil
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getSelectDescription_ValueExpression();
     }
@@ -32,6 +33,7 @@ public class SelectDescriptionValueExpressionFilter extends ViewpointPropertyFil
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.SelectDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textareadescription/TextAreaDescriptionLineCountFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textareadescription/TextAreaDescriptionLineCountFilter.java
index af67f2d7bc..5791a2c71a 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textareadescription/TextAreaDescriptionLineCountFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textareadescription/TextAreaDescriptionLineCountFilter.java
@@ -25,6 +25,7 @@ public class TextAreaDescriptionLineCountFilter extends ViewpointPropertyFilter
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getTextAreaDescription_LineCount();
     }
@@ -32,6 +33,7 @@ public class TextAreaDescriptionLineCountFilter extends ViewpointPropertyFilter
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.TextAreaDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textdescription/TextDescriptionValueExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textdescription/TextDescriptionValueExpressionFilter.java
index 73d05448a3..4dcc077c48 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textdescription/TextDescriptionValueExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/textdescription/TextDescriptionValueExpressionFilter.java
@@ -25,6 +25,7 @@ public class TextDescriptionValueExpressionFilter extends ViewpointPropertyFilte
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getTextDescription_ValueExpression();
     }
@@ -32,6 +33,7 @@ public class TextDescriptionValueExpressionFilter extends ViewpointPropertyFilte
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.TextDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionDefaultPageFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionDefaultPageFilter.java
index af6050c2ac..f57288c8e8 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionDefaultPageFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionDefaultPageFilter.java
@@ -25,6 +25,7 @@ public class ViewExtensionDescriptionDefaultPageFilter extends ViewpointProperty
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getViewExtensionDescription_DefaultPage();
     }
@@ -32,6 +33,7 @@ public class ViewExtensionDescriptionDefaultPageFilter extends ViewpointProperty
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.ViewExtensionDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionIdentifierFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionIdentifierFilter.java
index 31d060f50e..d2ca0961a7 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionIdentifierFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionIdentifierFilter.java
@@ -25,6 +25,7 @@ public class ViewExtensionDescriptionIdentifierFilter extends ViewpointPropertyF
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getViewExtensionDescription_Identifier();
     }
@@ -32,6 +33,7 @@ public class ViewExtensionDescriptionIdentifierFilter extends ViewpointPropertyF
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.ViewExtensionDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionLabelExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionLabelExpressionFilter.java
index 8d78177f98..665ac5f230 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionLabelExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionLabelExpressionFilter.java
@@ -25,6 +25,7 @@ public class ViewExtensionDescriptionLabelExpressionFilter extends ViewpointProp
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getViewExtensionDescription_LabelExpression();
     }
@@ -32,6 +33,7 @@ public class ViewExtensionDescriptionLabelExpressionFilter extends ViewpointProp
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.ViewExtensionDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionMetamodelsFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionMetamodelsFilter.java
index 62addcf1a5..769242c74e 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionMetamodelsFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/viewextensiondescription/ViewExtensionDescriptionMetamodelsFilter.java
@@ -25,6 +25,7 @@ public class ViewExtensionDescriptionMetamodelsFilter extends ViewpointPropertyF
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getViewExtensionDescription_Metamodels();
     }
@@ -32,6 +33,7 @@ public class ViewExtensionDescriptionMetamodelsFilter extends ViewpointPropertyF
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.ViewExtensionDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetdescription/WidgetDescriptionIdentifierFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetdescription/WidgetDescriptionIdentifierFilter.java
index 541e623c96..fdfdfa5b4c 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetdescription/WidgetDescriptionIdentifierFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetdescription/WidgetDescriptionIdentifierFilter.java
@@ -25,6 +25,7 @@ public class WidgetDescriptionIdentifierFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getWidgetDescription_Identifier();
     }
@@ -32,6 +33,7 @@ public class WidgetDescriptionIdentifierFilter extends ViewpointPropertyFilter {
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.WidgetDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetdescription/WidgetDescriptionLabelExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetdescription/WidgetDescriptionLabelExpressionFilter.java
index bb9da0aad2..b8ef37c368 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetdescription/WidgetDescriptionLabelExpressionFilter.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/widgetdescription/WidgetDescriptionLabelExpressionFilter.java
@@ -25,6 +25,7 @@ public class WidgetDescriptionLabelExpressionFilter extends ViewpointPropertyFil
     /**
      * {@inheritDoc}
      */
+    @Override
     protected EStructuralFeature getFeature() {
         return PropertiesPackage.eINSTANCE.getWidgetDescription_LabelExpression();
     }
@@ -32,6 +33,7 @@ public class WidgetDescriptionLabelExpressionFilter extends ViewpointPropertyFil
     /**
      * {@inheritDoc}
      */
+    @Override
     protected boolean isRightInputType(Object arg0) {
         return arg0 instanceof org.eclipse.sirius.properties.WidgetDescription;
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/buttondescription/ButtonDescriptionButtonLabelExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/buttondescription/ButtonDescriptionButtonLabelExpressionPropertySection.java
index 4756c14c30..b5fe608515 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/buttondescription/ButtonDescriptionButtonLabelExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/buttondescription/ButtonDescriptionButtonLabelExpressionPropertySection.java
@@ -35,6 +35,7 @@ public class ButtonDescriptionButtonLabelExpressionPropertySection extends Abstr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "ButtonLabelExpression"; //$NON-NLS-1$
     }
@@ -42,6 +43,7 @@ public class ButtonDescriptionButtonLabelExpressionPropertySection extends Abstr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -54,6 +56,7 @@ public class ButtonDescriptionButtonLabelExpressionPropertySection extends Abstr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getButtonDescription_ButtonLabelExpression();
     }
@@ -61,6 +64,7 @@ public class ButtonDescriptionButtonLabelExpressionPropertySection extends Abstr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -68,6 +72,7 @@ public class ButtonDescriptionButtonLabelExpressionPropertySection extends Abstr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -75,6 +80,7 @@ public class ButtonDescriptionButtonLabelExpressionPropertySection extends Abstr
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -93,6 +99,7 @@ public class ButtonDescriptionButtonLabelExpressionPropertySection extends Abstr
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), ButtonDescriptionButtonLabelExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -105,6 +112,7 @@ public class ButtonDescriptionButtonLabelExpressionPropertySection extends Abstr
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/checkboxdescription/CheckboxDescriptionValueExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/checkboxdescription/CheckboxDescriptionValueExpressionPropertySection.java
index e603869f0c..438a192f93 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/checkboxdescription/CheckboxDescriptionValueExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/checkboxdescription/CheckboxDescriptionValueExpressionPropertySection.java
@@ -34,6 +34,7 @@ public class CheckboxDescriptionValueExpressionPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "ValueExpression"; //$NON-NLS-1$
     }
@@ -41,6 +42,7 @@ public class CheckboxDescriptionValueExpressionPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -53,6 +55,7 @@ public class CheckboxDescriptionValueExpressionPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getCheckboxDescription_ValueExpression();
     }
@@ -60,6 +63,7 @@ public class CheckboxDescriptionValueExpressionPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -67,6 +71,7 @@ public class CheckboxDescriptionValueExpressionPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -74,6 +79,7 @@ public class CheckboxDescriptionValueExpressionPropertySection extends AbstractT
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -92,6 +98,7 @@ public class CheckboxDescriptionValueExpressionPropertySection extends AbstractT
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), CheckboxDescriptionValueExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -104,6 +111,7 @@ public class CheckboxDescriptionValueExpressionPropertySection extends AbstractT
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/containerdescription/ContainerDescriptionIdentifierPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/containerdescription/ContainerDescriptionIdentifierPropertySection.java
index 92d82642a2..c4e481b5ce 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/containerdescription/ContainerDescriptionIdentifierPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/containerdescription/ContainerDescriptionIdentifierPropertySection.java
@@ -28,6 +28,7 @@ public class ContainerDescriptionIdentifierPropertySection extends AbstractTextP
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "Identifier"; //$NON-NLS-1$
     }
@@ -35,6 +36,7 @@ public class ContainerDescriptionIdentifierPropertySection extends AbstractTextP
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
@@ -47,6 +49,7 @@ public class ContainerDescriptionIdentifierPropertySection extends AbstractTextP
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getContainerDescription_Identifier();
     }
@@ -54,6 +57,7 @@ public class ContainerDescriptionIdentifierPropertySection extends AbstractTextP
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -61,6 +65,7 @@ public class ContainerDescriptionIdentifierPropertySection extends AbstractTextP
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -68,6 +73,7 @@ public class ContainerDescriptionIdentifierPropertySection extends AbstractTextP
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
 
@@ -82,6 +88,7 @@ public class ContainerDescriptionIdentifierPropertySection extends AbstractTextP
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingcase/DynamicMappingCaseCaseExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingcase/DynamicMappingCaseCaseExpressionPropertySection.java
index 3b74401a0a..cb124dc5ff 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingcase/DynamicMappingCaseCaseExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingcase/DynamicMappingCaseCaseExpressionPropertySection.java
@@ -28,6 +28,7 @@ public class DynamicMappingCaseCaseExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "CaseExpression"; //$NON-NLS-1$
     }
@@ -35,6 +36,7 @@ public class DynamicMappingCaseCaseExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
@@ -47,6 +49,7 @@ public class DynamicMappingCaseCaseExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getDynamicMappingCase_CaseExpression();
     }
@@ -54,6 +57,7 @@ public class DynamicMappingCaseCaseExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -61,6 +65,7 @@ public class DynamicMappingCaseCaseExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -68,6 +73,7 @@ public class DynamicMappingCaseCaseExpressionPropertySection extends AbstractTex
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
 
@@ -82,6 +88,7 @@ public class DynamicMappingCaseCaseExpressionPropertySection extends AbstractTex
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionPropertySection.java
index ed74ed61a9..11090e9e7e 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForDomainClassExpressionPropertySection.java
@@ -29,6 +29,7 @@ public class DynamicMappingForDomainClassExpressionPropertySection extends Abstr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "DomainClassExpression"; //$NON-NLS-1$
     }
@@ -36,6 +37,7 @@ public class DynamicMappingForDomainClassExpressionPropertySection extends Abstr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
@@ -48,6 +50,7 @@ public class DynamicMappingForDomainClassExpressionPropertySection extends Abstr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getDynamicMappingFor_DomainClassExpression();
     }
@@ -55,6 +58,7 @@ public class DynamicMappingForDomainClassExpressionPropertySection extends Abstr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -62,6 +66,7 @@ public class DynamicMappingForDomainClassExpressionPropertySection extends Abstr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -69,6 +74,7 @@ public class DynamicMappingForDomainClassExpressionPropertySection extends Abstr
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
 
@@ -83,6 +89,7 @@ public class DynamicMappingForDomainClassExpressionPropertySection extends Abstr
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForIteratorPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForIteratorPropertySection.java
index d212c975e8..5d1e4d93bd 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForIteratorPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingfor/DynamicMappingForIteratorPropertySection.java
@@ -28,6 +28,7 @@ public class DynamicMappingForIteratorPropertySection extends AbstractTextProper
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "Iterator"; //$NON-NLS-1$
     }
@@ -35,6 +36,7 @@ public class DynamicMappingForIteratorPropertySection extends AbstractTextProper
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
@@ -47,6 +49,7 @@ public class DynamicMappingForIteratorPropertySection extends AbstractTextProper
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getDynamicMappingFor_Iterator();
     }
@@ -54,6 +57,7 @@ public class DynamicMappingForIteratorPropertySection extends AbstractTextProper
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -61,6 +65,7 @@ public class DynamicMappingForIteratorPropertySection extends AbstractTextProper
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -68,6 +73,7 @@ public class DynamicMappingForIteratorPropertySection extends AbstractTextProper
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
 
@@ -82,6 +88,7 @@ public class DynamicMappingForIteratorPropertySection extends AbstractTextProper
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingswitch/DynamicMappingSwitchSwitchExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingswitch/DynamicMappingSwitchSwitchExpressionPropertySection.java
index 46e17c4939..ac7a0b1c13 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingswitch/DynamicMappingSwitchSwitchExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/dynamicmappingswitch/DynamicMappingSwitchSwitchExpressionPropertySection.java
@@ -28,6 +28,7 @@ public class DynamicMappingSwitchSwitchExpressionPropertySection extends Abstrac
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "SwitchExpression"; //$NON-NLS-1$
     }
@@ -35,6 +36,7 @@ public class DynamicMappingSwitchSwitchExpressionPropertySection extends Abstrac
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
@@ -47,6 +49,7 @@ public class DynamicMappingSwitchSwitchExpressionPropertySection extends Abstrac
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getDynamicMappingSwitch_SwitchExpression();
     }
@@ -54,6 +57,7 @@ public class DynamicMappingSwitchSwitchExpressionPropertySection extends Abstrac
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -61,6 +65,7 @@ public class DynamicMappingSwitchSwitchExpressionPropertySection extends Abstrac
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -68,6 +73,7 @@ public class DynamicMappingSwitchSwitchExpressionPropertySection extends Abstrac
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
 
@@ -82,6 +88,7 @@ public class DynamicMappingSwitchSwitchExpressionPropertySection extends Abstrac
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionDomainClassPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionDomainClassPropertySection.java
index a429203ee8..1824d8221d 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionDomainClassPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionDomainClassPropertySection.java
@@ -29,6 +29,7 @@ public class GroupDescriptionDomainClassPropertySection extends AbstractTextProp
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "DomainClass"; //$NON-NLS-1$
     }
@@ -36,6 +37,7 @@ public class GroupDescriptionDomainClassPropertySection extends AbstractTextProp
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -48,6 +50,7 @@ public class GroupDescriptionDomainClassPropertySection extends AbstractTextProp
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getGroupDescription_DomainClass();
     }
@@ -55,6 +58,7 @@ public class GroupDescriptionDomainClassPropertySection extends AbstractTextProp
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -62,6 +66,7 @@ public class GroupDescriptionDomainClassPropertySection extends AbstractTextProp
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -69,6 +74,7 @@ public class GroupDescriptionDomainClassPropertySection extends AbstractTextProp
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -87,6 +93,7 @@ public class GroupDescriptionDomainClassPropertySection extends AbstractTextProp
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionIdentifierPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionIdentifierPropertySection.java
index 8128517e20..b388154f5f 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionIdentifierPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionIdentifierPropertySection.java
@@ -28,6 +28,7 @@ public class GroupDescriptionIdentifierPropertySection extends AbstractTextPrope
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "Identifier"; //$NON-NLS-1$
     }
@@ -35,6 +36,7 @@ public class GroupDescriptionIdentifierPropertySection extends AbstractTextPrope
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
@@ -47,6 +49,7 @@ public class GroupDescriptionIdentifierPropertySection extends AbstractTextPrope
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getGroupDescription_Identifier();
     }
@@ -54,6 +57,7 @@ public class GroupDescriptionIdentifierPropertySection extends AbstractTextPrope
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -61,6 +65,7 @@ public class GroupDescriptionIdentifierPropertySection extends AbstractTextPrope
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -68,6 +73,7 @@ public class GroupDescriptionIdentifierPropertySection extends AbstractTextPrope
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
 
@@ -82,6 +88,7 @@ public class GroupDescriptionIdentifierPropertySection extends AbstractTextPrope
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionLabelExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionLabelExpressionPropertySection.java
index 05d9f03a08..e6e3ad4250 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionLabelExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionLabelExpressionPropertySection.java
@@ -34,6 +34,7 @@ public class GroupDescriptionLabelExpressionPropertySection extends AbstractText
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "LabelExpression"; //$NON-NLS-1$
     }
@@ -41,6 +42,7 @@ public class GroupDescriptionLabelExpressionPropertySection extends AbstractText
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -53,6 +55,7 @@ public class GroupDescriptionLabelExpressionPropertySection extends AbstractText
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getGroupDescription_LabelExpression();
     }
@@ -60,6 +63,7 @@ public class GroupDescriptionLabelExpressionPropertySection extends AbstractText
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -67,6 +71,7 @@ public class GroupDescriptionLabelExpressionPropertySection extends AbstractText
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -74,6 +79,7 @@ public class GroupDescriptionLabelExpressionPropertySection extends AbstractText
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -92,6 +98,7 @@ public class GroupDescriptionLabelExpressionPropertySection extends AbstractText
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), GroupDescriptionLabelExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -104,6 +111,7 @@ public class GroupDescriptionLabelExpressionPropertySection extends AbstractText
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionSemanticCandidateExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionSemanticCandidateExpressionPropertySection.java
index 1579dacbbf..b263721a15 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionSemanticCandidateExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/groupdescription/GroupDescriptionSemanticCandidateExpressionPropertySection.java
@@ -35,6 +35,7 @@ public class GroupDescriptionSemanticCandidateExpressionPropertySection extends
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "SemanticCandidateExpression"; //$NON-NLS-1$
     }
@@ -42,6 +43,7 @@ public class GroupDescriptionSemanticCandidateExpressionPropertySection extends
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -54,6 +56,7 @@ public class GroupDescriptionSemanticCandidateExpressionPropertySection extends
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getGroupDescription_SemanticCandidateExpression();
     }
@@ -61,6 +64,7 @@ public class GroupDescriptionSemanticCandidateExpressionPropertySection extends
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -68,6 +72,7 @@ public class GroupDescriptionSemanticCandidateExpressionPropertySection extends
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -75,6 +80,7 @@ public class GroupDescriptionSemanticCandidateExpressionPropertySection extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -93,6 +99,7 @@ public class GroupDescriptionSemanticCandidateExpressionPropertySection extends
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), GroupDescriptionSemanticCandidateExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -105,6 +112,7 @@ public class GroupDescriptionSemanticCandidateExpressionPropertySection extends
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionDomainClassPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionDomainClassPropertySection.java
index 00052f02ab..a172b08a22 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionDomainClassPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionDomainClassPropertySection.java
@@ -29,6 +29,7 @@ public class PageDescriptionDomainClassPropertySection extends AbstractTextPrope
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "DomainClass"; //$NON-NLS-1$
     }
@@ -36,6 +37,7 @@ public class PageDescriptionDomainClassPropertySection extends AbstractTextPrope
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -48,6 +50,7 @@ public class PageDescriptionDomainClassPropertySection extends AbstractTextPrope
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getPageDescription_DomainClass();
     }
@@ -55,6 +58,7 @@ public class PageDescriptionDomainClassPropertySection extends AbstractTextPrope
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -62,6 +66,7 @@ public class PageDescriptionDomainClassPropertySection extends AbstractTextPrope
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -69,6 +74,7 @@ public class PageDescriptionDomainClassPropertySection extends AbstractTextPrope
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -87,6 +93,7 @@ public class PageDescriptionDomainClassPropertySection extends AbstractTextPrope
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionGroupsPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionGroupsPropertySection.java
index 7104a0527d..0f0483b6de 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionGroupsPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionGroupsPropertySection.java
@@ -30,6 +30,7 @@ public class PageDescriptionGroupsPropertySection extends AbstractEditorDialogPr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "Groups"; //$NON-NLS-1$
     }
@@ -37,6 +38,7 @@ public class PageDescriptionGroupsPropertySection extends AbstractEditorDialogPr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -49,6 +51,7 @@ public class PageDescriptionGroupsPropertySection extends AbstractEditorDialogPr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getFeature()
      */
+    @Override
     protected EReference getFeature() {
         return PropertiesPackage.eINSTANCE.getPageDescription_Groups();
     }
@@ -56,6 +59,7 @@ public class PageDescriptionGroupsPropertySection extends AbstractEditorDialogPr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getFeatureAsText()
      */
+    @Override
     protected String getFeatureAsText() {
         String string = new String();
 
@@ -64,8 +68,9 @@ public class PageDescriptionGroupsPropertySection extends AbstractEditorDialogPr
             for (Iterator<?> iterator = values.iterator(); iterator.hasNext();) {
                 EObject eObj = (EObject) iterator.next();
                 string += getAdapterFactoryLabelProvider(eObj).getText(eObj);
-                if (iterator.hasNext())
+                if (iterator.hasNext()) {
                     string += ", ";
+                }
             }
         }
 
@@ -75,6 +80,7 @@ public class PageDescriptionGroupsPropertySection extends AbstractEditorDialogPr
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#isEqual(java.util.List)
      */
+    @Override
     protected boolean isEqual(List<?> newList) {
         return newList.equals(eObject.eGet(getFeature()));
     }
@@ -82,6 +88,7 @@ public class PageDescriptionGroupsPropertySection extends AbstractEditorDialogPr
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         // Start of user code create controls
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionIdentifierPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionIdentifierPropertySection.java
index 7835c4728d..4b2d9251ff 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionIdentifierPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionIdentifierPropertySection.java
@@ -28,6 +28,7 @@ public class PageDescriptionIdentifierPropertySection extends AbstractTextProper
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "Identifier"; //$NON-NLS-1$
     }
@@ -35,6 +36,7 @@ public class PageDescriptionIdentifierPropertySection extends AbstractTextProper
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
@@ -47,6 +49,7 @@ public class PageDescriptionIdentifierPropertySection extends AbstractTextProper
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getPageDescription_Identifier();
     }
@@ -54,6 +57,7 @@ public class PageDescriptionIdentifierPropertySection extends AbstractTextProper
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -61,6 +65,7 @@ public class PageDescriptionIdentifierPropertySection extends AbstractTextProper
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -68,6 +73,7 @@ public class PageDescriptionIdentifierPropertySection extends AbstractTextProper
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
 
@@ -82,6 +88,7 @@ public class PageDescriptionIdentifierPropertySection extends AbstractTextProper
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionLabelExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionLabelExpressionPropertySection.java
index deb56b251f..f7734347c0 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionLabelExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionLabelExpressionPropertySection.java
@@ -34,6 +34,7 @@ public class PageDescriptionLabelExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "LabelExpression"; //$NON-NLS-1$
     }
@@ -41,6 +42,7 @@ public class PageDescriptionLabelExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -53,6 +55,7 @@ public class PageDescriptionLabelExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getPageDescription_LabelExpression();
     }
@@ -60,6 +63,7 @@ public class PageDescriptionLabelExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -67,6 +71,7 @@ public class PageDescriptionLabelExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -74,6 +79,7 @@ public class PageDescriptionLabelExpressionPropertySection extends AbstractTextW
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -92,6 +98,7 @@ public class PageDescriptionLabelExpressionPropertySection extends AbstractTextW
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), PageDescriptionLabelExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -104,6 +111,7 @@ public class PageDescriptionLabelExpressionPropertySection extends AbstractTextW
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionSemanticCandidateExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionSemanticCandidateExpressionPropertySection.java
index c06e9eda6e..639fb49406 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionSemanticCandidateExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/pagedescription/PageDescriptionSemanticCandidateExpressionPropertySection.java
@@ -35,6 +35,7 @@ public class PageDescriptionSemanticCandidateExpressionPropertySection extends A
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "SemanticCandidateExpression"; //$NON-NLS-1$
     }
@@ -42,6 +43,7 @@ public class PageDescriptionSemanticCandidateExpressionPropertySection extends A
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -54,6 +56,7 @@ public class PageDescriptionSemanticCandidateExpressionPropertySection extends A
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getPageDescription_SemanticCandidateExpression();
     }
@@ -61,6 +64,7 @@ public class PageDescriptionSemanticCandidateExpressionPropertySection extends A
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -68,6 +72,7 @@ public class PageDescriptionSemanticCandidateExpressionPropertySection extends A
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -75,6 +80,7 @@ public class PageDescriptionSemanticCandidateExpressionPropertySection extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -93,6 +99,7 @@ public class PageDescriptionSemanticCandidateExpressionPropertySection extends A
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), PageDescriptionSemanticCandidateExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -105,6 +112,7 @@ public class PageDescriptionSemanticCandidateExpressionPropertySection extends A
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionCandidateDisplayExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionCandidateDisplayExpressionPropertySection.java
new file mode 100644
index 0000000000..d9a9e83910
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionCandidateDisplayExpressionPropertySection.java
@@ -0,0 +1,123 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.sections.properties.radiodescription;
+
+// Start of user code imports
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
+import org.eclipse.sirius.editor.tools.api.assist.TypeContentProposalProvider;
+import org.eclipse.sirius.editor.tools.internal.presentation.TextWithContentProposalDialog;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the candidateDisplayExpression property of a RadioDescription
+ * object.
+ */
+public class RadioDescriptionCandidateDisplayExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient {
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "CandidateDisplayExpression"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
+     */
+    @Override
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
+     */
+    @Override
+    public EAttribute getFeature() {
+        return PropertiesPackage.eINSTANCE.getRadioDescription_CandidateDisplayExpression();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
+     */
+    @Override
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
+     */
+    @Override
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+        /*
+         * We set the color as it's a InterpretedExpression
+         */
+        text.setBackground(SiriusEditor.getColorRegistry().get("yellow"));
+
+        TypeContentProposalProvider.bindPluginsCompletionProcessors(this, text);
+
+        // Start of user code create controls
+
+        // End of user code create controls
+
+    }
+
+    @Override
+    protected SelectionListener createButtonListener() {
+        return new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), RadioDescriptionCandidateDisplayExpressionPropertySection.this, text.getText());
+                dialog.open();
+                text.setText(dialog.getResult());
+                handleTextModified();
+            }
+        };
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected String getPropertyDescription() {
+        return "";
+    }
+
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionCandidatesExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionCandidatesExpressionPropertySection.java
new file mode 100644
index 0000000000..f3c8760a4d
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionCandidatesExpressionPropertySection.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.sections.properties.radiodescription;
+
+// Start of user code imports
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
+import org.eclipse.sirius.editor.tools.api.assist.TypeContentProposalProvider;
+import org.eclipse.sirius.editor.tools.internal.presentation.TextWithContentProposalDialog;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the candidatesExpression property of a RadioDescription object.
+ */
+public class RadioDescriptionCandidatesExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient {
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "CandidatesExpression"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
+     */
+    @Override
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
+     */
+    @Override
+    public EAttribute getFeature() {
+        return PropertiesPackage.eINSTANCE.getRadioDescription_CandidatesExpression();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
+     */
+    @Override
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
+     */
+    @Override
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+        /*
+         * We set the color as it's a InterpretedExpression
+         */
+        text.setBackground(SiriusEditor.getColorRegistry().get("yellow"));
+
+        TypeContentProposalProvider.bindPluginsCompletionProcessors(this, text);
+
+        // Start of user code create controls
+
+        // End of user code create controls
+
+    }
+
+    @Override
+    protected SelectionListener createButtonListener() {
+        return new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), RadioDescriptionCandidatesExpressionPropertySection.this, text.getText());
+                dialog.open();
+                text.setText(dialog.getResult());
+                handleTextModified();
+            }
+        };
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected String getPropertyDescription() {
+        return "";
+    }
+
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionValueExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionValueExpressionPropertySection.java
new file mode 100644
index 0000000000..6c23e4b0ea
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/radiodescription/RadioDescriptionValueExpressionPropertySection.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.properties.editor.properties.sections.properties.radiodescription;
+
+// Start of user code imports
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextWithButtonPropertySection;
+import org.eclipse.sirius.editor.tools.api.assist.TypeContentProposalProvider;
+import org.eclipse.sirius.editor.tools.internal.presentation.TextWithContentProposalDialog;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.ui.tools.api.assist.ContentProposalClient;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the valueExpression property of a RadioDescription object.
+ */
+public class RadioDescriptionValueExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient {
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
+     */
+    @Override
+    protected String getDefaultLabelText() {
+        return "ValueExpression"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
+     */
+    @Override
+    protected String getLabelText() {
+        String labelText;
+        labelText = super.getLabelText() + ":"; //$NON-NLS-1$
+        // Start of user code get label text
+
+        // End of user code get label text
+        return labelText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
+     */
+    @Override
+    public EAttribute getFeature() {
+        return PropertiesPackage.eINSTANCE.getRadioDescription_ValueExpression();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
+     */
+    @Override
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
+     */
+    @Override
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+        /*
+         * We set the color as it's a InterpretedExpression
+         */
+        text.setBackground(SiriusEditor.getColorRegistry().get("yellow"));
+
+        TypeContentProposalProvider.bindPluginsCompletionProcessors(this, text);
+
+        // Start of user code create controls
+
+        // End of user code create controls
+
+    }
+
+    @Override
+    protected SelectionListener createButtonListener() {
+        return new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), RadioDescriptionValueExpressionPropertySection.this, text.getText());
+                dialog.open();
+                text.setText(dialog.getResult());
+                handleTextModified();
+            }
+        };
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected String getPropertyDescription() {
+        return "";
+    }
+
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidateDisplayExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidateDisplayExpressionPropertySection.java
index e9cacbe769..08d7026854 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidateDisplayExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidateDisplayExpressionPropertySection.java
@@ -35,6 +35,7 @@ public class SelectDescriptionCandidateDisplayExpressionPropertySection extends
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "CandidateDisplayExpression"; //$NON-NLS-1$
     }
@@ -42,6 +43,7 @@ public class SelectDescriptionCandidateDisplayExpressionPropertySection extends
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -54,6 +56,7 @@ public class SelectDescriptionCandidateDisplayExpressionPropertySection extends
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getSelectDescription_CandidateDisplayExpression();
     }
@@ -61,6 +64,7 @@ public class SelectDescriptionCandidateDisplayExpressionPropertySection extends
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -68,6 +72,7 @@ public class SelectDescriptionCandidateDisplayExpressionPropertySection extends
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -75,6 +80,7 @@ public class SelectDescriptionCandidateDisplayExpressionPropertySection extends
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -93,6 +99,7 @@ public class SelectDescriptionCandidateDisplayExpressionPropertySection extends
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), SelectDescriptionCandidateDisplayExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -105,6 +112,7 @@ public class SelectDescriptionCandidateDisplayExpressionPropertySection extends
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidatesExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidatesExpressionPropertySection.java
index ad30fb91a1..65fe647112 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidatesExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionCandidatesExpressionPropertySection.java
@@ -35,6 +35,7 @@ public class SelectDescriptionCandidatesExpressionPropertySection extends Abstra
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "CandidatesExpression"; //$NON-NLS-1$
     }
@@ -42,6 +43,7 @@ public class SelectDescriptionCandidatesExpressionPropertySection extends Abstra
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -54,6 +56,7 @@ public class SelectDescriptionCandidatesExpressionPropertySection extends Abstra
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getSelectDescription_CandidatesExpression();
     }
@@ -61,6 +64,7 @@ public class SelectDescriptionCandidatesExpressionPropertySection extends Abstra
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -68,6 +72,7 @@ public class SelectDescriptionCandidatesExpressionPropertySection extends Abstra
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -75,6 +80,7 @@ public class SelectDescriptionCandidatesExpressionPropertySection extends Abstra
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -93,6 +99,7 @@ public class SelectDescriptionCandidatesExpressionPropertySection extends Abstra
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), SelectDescriptionCandidatesExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -105,6 +112,7 @@ public class SelectDescriptionCandidatesExpressionPropertySection extends Abstra
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionValueExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionValueExpressionPropertySection.java
index dcf090bcae..10ea2a85ac 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionValueExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/selectdescription/SelectDescriptionValueExpressionPropertySection.java
@@ -34,6 +34,7 @@ public class SelectDescriptionValueExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "ValueExpression"; //$NON-NLS-1$
     }
@@ -41,6 +42,7 @@ public class SelectDescriptionValueExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -53,6 +55,7 @@ public class SelectDescriptionValueExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getSelectDescription_ValueExpression();
     }
@@ -60,6 +63,7 @@ public class SelectDescriptionValueExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -67,6 +71,7 @@ public class SelectDescriptionValueExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -74,6 +79,7 @@ public class SelectDescriptionValueExpressionPropertySection extends AbstractTex
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -92,6 +98,7 @@ public class SelectDescriptionValueExpressionPropertySection extends AbstractTex
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), SelectDescriptionValueExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -104,6 +111,7 @@ public class SelectDescriptionValueExpressionPropertySection extends AbstractTex
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textareadescription/TextAreaDescriptionLineCountPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textareadescription/TextAreaDescriptionLineCountPropertySection.java
index 18fe745f00..0fa71a82b0 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textareadescription/TextAreaDescriptionLineCountPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textareadescription/TextAreaDescriptionLineCountPropertySection.java
@@ -22,6 +22,7 @@ public class TextAreaDescriptionLineCountPropertySection extends AbstractSpinner
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "LineCount"; //$NON-NLS-1$
     }
@@ -29,6 +30,7 @@ public class TextAreaDescriptionLineCountPropertySection extends AbstractSpinner
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -41,6 +43,7 @@ public class TextAreaDescriptionLineCountPropertySection extends AbstractSpinner
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getFeature()
      */
+    @Override
     protected EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getTextAreaDescription_LineCount();
     }
@@ -48,35 +51,40 @@ public class TextAreaDescriptionLineCountPropertySection extends AbstractSpinner
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getFeatureAsInteger()
      */
+    @Override
     protected String getFeatureAsText() {
         String value = new String();
-        if (eObject.eGet(getFeature()) != null)
+        if (eObject.eGet(getFeature()) != null) {
             value = toInteger(eObject.eGet(getFeature()).toString()).toString();
+        }
         return value;
     }
 
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#isEqual(int)
      */
+    @Override
     protected boolean isEqual(String newText) {
         boolean equal = true;
-        if (toInteger(newText) != null)
+        if (toInteger(newText) != null) {
             equal = getFeatureAsText().equals(toInteger(newText).toString());
-        else
+        } else {
             refresh();
+        }
         return equal;
     }
 
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractSpinnerPropertySection#getFeatureValue(int)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return toInteger(newText);
     }
 
     /**
      * Converts the given text to the integer it represents if applicable.
-     * 
+     *
      * @return The integer the given text represents if applicable,
      *         <code>null</code> otherwise.
      */
@@ -93,6 +101,7 @@ public class TextAreaDescriptionLineCountPropertySection extends AbstractSpinner
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
 
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textdescription/TextDescriptionValueExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textdescription/TextDescriptionValueExpressionPropertySection.java
index 02e9fc863d..242eba1947 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textdescription/TextDescriptionValueExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/textdescription/TextDescriptionValueExpressionPropertySection.java
@@ -34,6 +34,7 @@ public class TextDescriptionValueExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "ValueExpression"; //$NON-NLS-1$
     }
@@ -41,6 +42,7 @@ public class TextDescriptionValueExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -53,6 +55,7 @@ public class TextDescriptionValueExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getTextDescription_ValueExpression();
     }
@@ -60,6 +63,7 @@ public class TextDescriptionValueExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -67,6 +71,7 @@ public class TextDescriptionValueExpressionPropertySection extends AbstractTextW
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -74,6 +79,7 @@ public class TextDescriptionValueExpressionPropertySection extends AbstractTextW
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -92,6 +98,7 @@ public class TextDescriptionValueExpressionPropertySection extends AbstractTextW
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), TextDescriptionValueExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -104,6 +111,7 @@ public class TextDescriptionValueExpressionPropertySection extends AbstractTextW
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionDefaultPagePropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionDefaultPagePropertySection.java
index 66eb827739..6371fa4fe9 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionDefaultPagePropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionDefaultPagePropertySection.java
@@ -13,7 +13,6 @@ package org.eclipse.sirius.properties.editor.properties.sections.properties.view
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.emf.ecore.EReference;
@@ -33,6 +32,7 @@ public class ViewExtensionDescriptionDefaultPagePropertySection extends Abstract
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "DefaultPage"; //$NON-NLS-1$
     }
@@ -40,6 +40,7 @@ public class ViewExtensionDescriptionDefaultPagePropertySection extends Abstract
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -52,6 +53,7 @@ public class ViewExtensionDescriptionDefaultPagePropertySection extends Abstract
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getFeature()
      */
+    @Override
     protected EReference getFeature() {
         return PropertiesPackage.eINSTANCE.getViewExtensionDescription_DefaultPage();
     }
@@ -59,6 +61,7 @@ public class ViewExtensionDescriptionDefaultPagePropertySection extends Abstract
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#getFeatureValue(int)
      */
+    @Override
     protected Object getFeatureValue(int index) {
         return getFeatureValueAt(index);
     }
@@ -66,19 +69,21 @@ public class ViewExtensionDescriptionDefaultPagePropertySection extends Abstract
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractComboPropertySection#isEqual(int)
      */
+    @Override
     protected boolean isEqual(int index) {
         boolean isEqual = false;
-        if (getFeatureValueAt(index) == null)
+        if (getFeatureValueAt(index) == null) {
             isEqual = eObject.eGet(getFeature()) == null;
-        else
+        } else {
             isEqual = getFeatureValueAt(index).equals(eObject.eGet(getFeature()));
+        }
         return isEqual;
     }
 
     /**
      * Returns the value at the specified index in the choice of values for the
      * feature.
-     * 
+     *
      * @param index
      *            Index of the value.
      * @return the value at the specified index in the choice of values.
@@ -93,16 +98,17 @@ public class ViewExtensionDescriptionDefaultPagePropertySection extends Abstract
 
     /**
      * Fetches the list of available values for the feature.
-     * 
+     *
      * @return The list of available values for the feature.
      */
+    @Override
     protected List<?> getChoiceOfValues() {
         List<?> values = Collections.emptyList();
         List<IItemPropertyDescriptor> propertyDescriptors = getDescriptors();
-        for (Iterator<IItemPropertyDescriptor> iterator = propertyDescriptors.iterator(); iterator.hasNext();) {
-            IItemPropertyDescriptor propertyDescriptor = iterator.next();
-            if (((EStructuralFeature) propertyDescriptor.getFeature(eObject)) == getFeature())
+        for (IItemPropertyDescriptor propertyDescriptor : propertyDescriptors) {
+            if (((EStructuralFeature) propertyDescriptor.getFeature(eObject)) == getFeature()) {
                 values = new ArrayList<Object>(propertyDescriptor.getChoiceOfValues(eObject));
+            }
         }
 
         // Start of user code choice of values
@@ -113,6 +119,7 @@ public class ViewExtensionDescriptionDefaultPagePropertySection extends Abstract
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         // Start of user code create controls
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionIdentifierPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionIdentifierPropertySection.java
index 08c51e078a..3a4f94cb3e 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionIdentifierPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionIdentifierPropertySection.java
@@ -28,6 +28,7 @@ public class ViewExtensionDescriptionIdentifierPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "Identifier"; //$NON-NLS-1$
     }
@@ -35,6 +36,7 @@ public class ViewExtensionDescriptionIdentifierPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
@@ -47,6 +49,7 @@ public class ViewExtensionDescriptionIdentifierPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getViewExtensionDescription_Identifier();
     }
@@ -54,6 +57,7 @@ public class ViewExtensionDescriptionIdentifierPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -61,6 +65,7 @@ public class ViewExtensionDescriptionIdentifierPropertySection extends AbstractT
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -68,6 +73,7 @@ public class ViewExtensionDescriptionIdentifierPropertySection extends AbstractT
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
 
@@ -82,6 +88,7 @@ public class ViewExtensionDescriptionIdentifierPropertySection extends AbstractT
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionLabelExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionLabelExpressionPropertySection.java
index 904564cbe0..cd26072039 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionLabelExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionLabelExpressionPropertySection.java
@@ -35,6 +35,7 @@ public class ViewExtensionDescriptionLabelExpressionPropertySection extends Abst
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "LabelExpression"; //$NON-NLS-1$
     }
@@ -42,6 +43,7 @@ public class ViewExtensionDescriptionLabelExpressionPropertySection extends Abst
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -54,6 +56,7 @@ public class ViewExtensionDescriptionLabelExpressionPropertySection extends Abst
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getViewExtensionDescription_LabelExpression();
     }
@@ -61,6 +64,7 @@ public class ViewExtensionDescriptionLabelExpressionPropertySection extends Abst
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -68,6 +72,7 @@ public class ViewExtensionDescriptionLabelExpressionPropertySection extends Abst
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -75,6 +80,7 @@ public class ViewExtensionDescriptionLabelExpressionPropertySection extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -93,6 +99,7 @@ public class ViewExtensionDescriptionLabelExpressionPropertySection extends Abst
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), ViewExtensionDescriptionLabelExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -105,6 +112,7 @@ public class ViewExtensionDescriptionLabelExpressionPropertySection extends Abst
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionMetamodelsPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionMetamodelsPropertySection.java
index 9ce25dcd10..d3e8fab152 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionMetamodelsPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/viewextensiondescription/ViewExtensionDescriptionMetamodelsPropertySection.java
@@ -30,6 +30,7 @@ public class ViewExtensionDescriptionMetamodelsPropertySection extends AbstractE
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "Metamodels"; //$NON-NLS-1$
     }
@@ -37,6 +38,7 @@ public class ViewExtensionDescriptionMetamodelsPropertySection extends AbstractE
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -49,6 +51,7 @@ public class ViewExtensionDescriptionMetamodelsPropertySection extends AbstractE
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getFeature()
      */
+    @Override
     protected EReference getFeature() {
         return PropertiesPackage.eINSTANCE.getViewExtensionDescription_Metamodels();
     }
@@ -56,6 +59,7 @@ public class ViewExtensionDescriptionMetamodelsPropertySection extends AbstractE
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#getFeatureAsText()
      */
+    @Override
     protected String getFeatureAsText() {
         String string = new String();
 
@@ -64,8 +68,9 @@ public class ViewExtensionDescriptionMetamodelsPropertySection extends AbstractE
             for (Iterator<?> iterator = values.iterator(); iterator.hasNext();) {
                 EObject eObj = (EObject) iterator.next();
                 string += getAdapterFactoryLabelProvider(eObj).getText(eObj);
-                if (iterator.hasNext())
+                if (iterator.hasNext()) {
                     string += ", ";
+                }
             }
         }
 
@@ -75,6 +80,7 @@ public class ViewExtensionDescriptionMetamodelsPropertySection extends AbstractE
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractEditorDialogPropertySection#isEqual(java.util.List)
      */
+    @Override
     protected boolean isEqual(List<?> newList) {
         return newList.equals(eObject.eGet(getFeature()));
     }
@@ -82,6 +88,7 @@ public class ViewExtensionDescriptionMetamodelsPropertySection extends AbstractE
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         // Start of user code create controls
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionIdentifierPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionIdentifierPropertySection.java
index a6508282b9..a66820c087 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionIdentifierPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionIdentifierPropertySection.java
@@ -28,6 +28,7 @@ public class WidgetDescriptionIdentifierPropertySection extends AbstractTextProp
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "Identifier"; //$NON-NLS-1$
     }
@@ -35,6 +36,7 @@ public class WidgetDescriptionIdentifierPropertySection extends AbstractTextProp
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + "*:"; //$NON-NLS-1$
@@ -47,6 +49,7 @@ public class WidgetDescriptionIdentifierPropertySection extends AbstractTextProp
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getWidgetDescription_Identifier();
     }
@@ -54,6 +57,7 @@ public class WidgetDescriptionIdentifierPropertySection extends AbstractTextProp
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -61,6 +65,7 @@ public class WidgetDescriptionIdentifierPropertySection extends AbstractTextProp
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -68,6 +73,7 @@ public class WidgetDescriptionIdentifierPropertySection extends AbstractTextProp
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
 
@@ -82,6 +88,7 @@ public class WidgetDescriptionIdentifierPropertySection extends AbstractTextProp
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionLabelExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionLabelExpressionPropertySection.java
index 96f127fb4f..63ab46459d 100644
--- a/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionLabelExpressionPropertySection.java
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/widgetdescription/WidgetDescriptionLabelExpressionPropertySection.java
@@ -34,6 +34,7 @@ public class WidgetDescriptionLabelExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
      */
+    @Override
     protected String getDefaultLabelText() {
         return "LabelExpression"; //$NON-NLS-1$
     }
@@ -41,6 +42,7 @@ public class WidgetDescriptionLabelExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
      */
+    @Override
     protected String getLabelText() {
         String labelText;
         labelText = super.getLabelText() + ":"; //$NON-NLS-1$
@@ -53,6 +55,7 @@ public class WidgetDescriptionLabelExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeature()
      */
+    @Override
     public EAttribute getFeature() {
         return PropertiesPackage.eINSTANCE.getWidgetDescription_LabelExpression();
     }
@@ -60,6 +63,7 @@ public class WidgetDescriptionLabelExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
      */
+    @Override
     protected Object getFeatureValue(String newText) {
         return newText;
     }
@@ -67,6 +71,7 @@ public class WidgetDescriptionLabelExpressionPropertySection extends AbstractTex
     /**
      * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
      */
+    @Override
     protected boolean isEqual(String newText) {
         return getFeatureAsText().equals(newText);
     }
@@ -74,6 +79,7 @@ public class WidgetDescriptionLabelExpressionPropertySection extends AbstractTex
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
         super.createControls(parent, tabbedPropertySheetPage);
         /*
@@ -92,6 +98,7 @@ public class WidgetDescriptionLabelExpressionPropertySection extends AbstractTex
     @Override
     protected SelectionListener createButtonListener() {
         return new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent e) {
                 TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), WidgetDescriptionLabelExpressionPropertySection.this, text.getText());
                 dialog.open();
@@ -104,6 +111,7 @@ public class WidgetDescriptionLabelExpressionPropertySection extends AbstractTex
     /**
      * {@inheritDoc}
      */
+    @Override
     protected String getPropertyDescription() {
         return "";
     }
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/RadioDescription.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/RadioDescription.gif
new file mode 100644
index 0000000000..ed87474740
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/RadioDescription.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/plugin.properties b/incubation/org.eclipse.sirius.properties.edit/plugin.properties
index ffe31b0e7a..fabcc2eeea 100644
--- a/incubation/org.eclipse.sirius.properties.edit/plugin.properties
+++ b/incubation/org.eclipse.sirius.properties.edit/plugin.properties
@@ -73,4 +73,9 @@ _UI_ButtonDescription_valueExpression_feature = Value Expression
 _UI_ButtonDescription_initialOperation_feature = Initial Operation
 _UI_ButtonDescription_buttonLabelExpression_feature = Button Label Expression
 _UI_TextAreaDescription_type = Text Area Description
+_UI_RadioDescription_type = Radio Description
+_UI_RadioDescription_valueExpression_feature = Value Expression
+_UI_RadioDescription_initialOperation_feature = Initial Operation
+_UI_RadioDescription_candidatesExpression_feature = Candidates Expression
+_UI_RadioDescription_candidateDisplayExpression_feature = Candidate Display Expression
 _UI_TextAreaDescription_lineCount_feature = Line Count
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
index 1853386e48..5a83741656 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -29,14 +29,14 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.ButtonDescription} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public ButtonDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -46,7 +46,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns the property descriptors for the adapted class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -155,7 +155,7 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
index 7ee255997d..28c119f89b 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -29,14 +29,14 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.CheckboxDescription} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public CheckboxDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -46,7 +46,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
     /**
      * This returns the property descriptors for the adapted class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -62,7 +62,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
     /**
      * This adds a property descriptor for the Value Expression feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addValueExpressionPropertyDescriptor(Object object) {
@@ -155,7 +155,7 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
index b5b7062cbe..a55acf3f07 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ContainerDescriptionItemProvider.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -36,15 +36,15 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.ContainerDescription} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ContainerDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-        IItemPropertySource {
+IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public ContainerDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -54,7 +54,7 @@ public class ContainerDescriptionItemProvider extends ItemProviderAdapter implem
     /**
      * This returns the property descriptors for the adapted class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -70,7 +70,7 @@ public class ContainerDescriptionItemProvider extends ItemProviderAdapter implem
     /**
      * This adds a property descriptor for the Identifier feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
@@ -165,7 +165,7 @@ public class ContainerDescriptionItemProvider extends ItemProviderAdapter implem
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -184,13 +184,15 @@ public class ContainerDescriptionItemProvider extends ItemProviderAdapter implem
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__WIDGETS, PropertiesFactory.eINSTANCE.createTextAreaDescription()));
 
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__WIDGETS, PropertiesFactory.eINSTANCE.createRadioDescription()));
+
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS, PropertiesFactory.eINSTANCE.createDynamicMappingFor()));
     }
 
     /**
      * Return the resource locator for this item provider's resources. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingCaseItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingCaseItemProvider.java
index a1a09b875b..d657aa0856 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingCaseItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingCaseItemProvider.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -36,15 +36,15 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.DynamicMappingCase} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class DynamicMappingCaseItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-        IItemPropertySource {
+IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public DynamicMappingCaseItemProvider(AdapterFactory adapterFactory) {
@@ -54,7 +54,7 @@ public class DynamicMappingCaseItemProvider extends ItemProviderAdapter implemen
     /**
      * This returns the property descriptors for the adapted class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -70,7 +70,7 @@ public class DynamicMappingCaseItemProvider extends ItemProviderAdapter implemen
     /**
      * This adds a property descriptor for the Case Expression feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addCaseExpressionPropertyDescriptor(Object object) {
@@ -163,7 +163,7 @@ public class DynamicMappingCaseItemProvider extends ItemProviderAdapter implemen
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -181,12 +181,14 @@ public class DynamicMappingCaseItemProvider extends ItemProviderAdapter implemen
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.DYNAMIC_MAPPING_CASE__WIDGET, PropertiesFactory.eINSTANCE.createSelectDescription()));
 
         newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.DYNAMIC_MAPPING_CASE__WIDGET, PropertiesFactory.eINSTANCE.createTextAreaDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.DYNAMIC_MAPPING_CASE__WIDGET, PropertiesFactory.eINSTANCE.createRadioDescription()));
     }
 
     /**
      * Return the resource locator for this item provider's resources. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
index 2d1f44aa3b..65a58cfed2 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -36,15 +36,15 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.DynamicMappingFor} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class DynamicMappingForItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-        IItemPropertySource {
+IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public DynamicMappingForItemProvider(AdapterFactory adapterFactory) {
@@ -54,7 +54,7 @@ public class DynamicMappingForItemProvider extends ItemProviderAdapter implement
     /**
      * This returns the property descriptors for the adapted class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -71,7 +71,7 @@ public class DynamicMappingForItemProvider extends ItemProviderAdapter implement
     /**
      * This adds a property descriptor for the Iterator feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addIteratorPropertyDescriptor(Object object) {
@@ -177,7 +177,7 @@ public class DynamicMappingForItemProvider extends ItemProviderAdapter implement
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -190,7 +190,7 @@ public class DynamicMappingForItemProvider extends ItemProviderAdapter implement
     /**
      * Return the resource locator for this item provider's resources. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingSwitchItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingSwitchItemProvider.java
index 1cfe041378..7c96958693 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingSwitchItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingSwitchItemProvider.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -36,15 +36,15 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.DynamicMappingSwitch} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class DynamicMappingSwitchItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-        IItemPropertySource {
+IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public DynamicMappingSwitchItemProvider(AdapterFactory adapterFactory) {
@@ -54,7 +54,7 @@ public class DynamicMappingSwitchItemProvider extends ItemProviderAdapter implem
     /**
      * This returns the property descriptors for the adapted class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -70,7 +70,7 @@ public class DynamicMappingSwitchItemProvider extends ItemProviderAdapter implem
     /**
      * This adds a property descriptor for the Switch Expression feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addSwitchExpressionPropertyDescriptor(Object object) {
@@ -163,7 +163,7 @@ public class DynamicMappingSwitchItemProvider extends ItemProviderAdapter implem
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -176,7 +176,7 @@ public class DynamicMappingSwitchItemProvider extends ItemProviderAdapter implem
     /**
      * Return the resource locator for this item provider's resources. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
index 0191580731..20413d401e 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/GroupDescriptionItemProvider.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -36,15 +36,15 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.GroupDescription} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class GroupDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-        IItemPropertySource {
+IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public GroupDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -54,7 +54,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter implements
     /**
      * This returns the property descriptors for the adapted class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -73,7 +73,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter implements
     /**
      * This adds a property descriptor for the Identifier feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
@@ -85,7 +85,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter implements
     /**
      * This adds a property descriptor for the Label Expression feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
@@ -98,7 +98,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter implements
     /**
      * This adds a property descriptor for the Domain Class feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
@@ -206,7 +206,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter implements
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -219,7 +219,7 @@ public class GroupDescriptionItemProvider extends ItemProviderAdapter implements
     /**
      * Return the resource locator for this item provider's resources. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
index 36d1bb5698..16fb255522 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -23,14 +23,14 @@ import org.eclipse.sirius.properties.LabelDescription;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.LabelDescription} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public LabelDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -40,7 +40,7 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns the property descriptors for the adapted class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -93,7 +93,7 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
index d21f94e72a..43066a54ab 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PageDescriptionItemProvider.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -34,15 +34,15 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.PageDescription} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class PageDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-        IItemPropertySource {
+IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public PageDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -52,7 +52,7 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter implements
     /**
      * This returns the property descriptors for the adapted class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -72,7 +72,7 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter implements
     /**
      * This adds a property descriptor for the Identifier feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
@@ -84,7 +84,7 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter implements
     /**
      * This adds a property descriptor for the Label Expression feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
@@ -96,7 +96,7 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter implements
     /**
      * This adds a property descriptor for the Domain Class feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
@@ -121,7 +121,7 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter implements
     /**
      * This adds a property descriptor for the Groups feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addGroupsPropertyDescriptor(Object object) {
@@ -180,7 +180,7 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter implements
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -191,7 +191,7 @@ public class PageDescriptionItemProvider extends ItemProviderAdapter implements
     /**
      * Return the resource locator for this item provider's resources. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java
index 7f97bdef37..d21d33263e 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesEditPlugin.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -19,14 +19,14 @@ import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 /**
  * This is the central singleton for the Properties edit plugin. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public final class PropertiesEditPlugin extends EMFPlugin {
     /**
      * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      */
     public static final PropertiesEditPlugin INSTANCE = new PropertiesEditPlugin();
@@ -34,7 +34,7 @@ public final class PropertiesEditPlugin extends EMFPlugin {
     /**
      * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      */
     private static Implementation plugin;
@@ -57,7 +57,7 @@ public final class PropertiesEditPlugin extends EMFPlugin {
      */
     @Override
     public ResourceLocator getPluginResourceLocator() {
-        return plugin;
+        return PropertiesEditPlugin.plugin;
     }
 
     /**
@@ -68,13 +68,13 @@ public final class PropertiesEditPlugin extends EMFPlugin {
      * @generated
      */
     public static Implementation getPlugin() {
-        return plugin;
+        return PropertiesEditPlugin.plugin;
     }
 
     /**
      * The actual implementation of the Eclipse <b>Plugin</b>. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public static class Implementation extends EclipsePlugin {
@@ -88,7 +88,7 @@ public final class PropertiesEditPlugin extends EMFPlugin {
 
             // Remember the static instance.
             //
-            plugin = this;
+            PropertiesEditPlugin.plugin = this;
         }
     }
 
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
index 63da3dd801..04bf5a33b5 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -63,7 +63,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This is used to implement
      * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -80,7 +80,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     /**
      * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      */
     public PropertiesItemProviderAdapterFactory() {
@@ -104,7 +104,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.ViewExtensionDescription}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -120,7 +120,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.PageDescription} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected PageDescriptionItemProvider pageDescriptionItemProvider;
@@ -129,7 +129,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.PageDescription}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -145,7 +145,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.GroupDescription} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected GroupDescriptionItemProvider groupDescriptionItemProvider;
@@ -154,7 +154,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.GroupDescription}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -179,7 +179,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.ContainerDescription}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -195,7 +195,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.TextDescription} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected TextDescriptionItemProvider textDescriptionItemProvider;
@@ -204,7 +204,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.TextDescription}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -220,7 +220,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.ButtonDescription} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected ButtonDescriptionItemProvider buttonDescriptionItemProvider;
@@ -229,7 +229,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.ButtonDescription}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -245,7 +245,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.LabelDescription} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected LabelDescriptionItemProvider labelDescriptionItemProvider;
@@ -254,7 +254,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.LabelDescription}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -270,7 +270,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.CheckboxDescription} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected CheckboxDescriptionItemProvider checkboxDescriptionItemProvider;
@@ -279,7 +279,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.CheckboxDescription}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -295,7 +295,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.SelectDescription} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected SelectDescriptionItemProvider selectDescriptionItemProvider;
@@ -304,7 +304,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.SelectDescription}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -320,7 +320,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.DynamicMappingFor} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected DynamicMappingForItemProvider dynamicMappingForItemProvider;
@@ -329,7 +329,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.DynamicMappingFor}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -354,7 +354,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.DynamicMappingSwitch}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -370,7 +370,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.DynamicMappingCase} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected DynamicMappingCaseItemProvider dynamicMappingCaseItemProvider;
@@ -379,7 +379,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.DynamicMappingCase}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -395,7 +395,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.properties.TextAreaDescription} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected TextAreaDescriptionItemProvider textAreaDescriptionItemProvider;
@@ -404,7 +404,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This creates an adapter for a
      * {@link org.eclipse.sirius.properties.TextAreaDescription}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -417,11 +417,37 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.RadioDescription} instances. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected RadioDescriptionItemProvider radioDescriptionItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.RadioDescription}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public Adapter createRadioDescriptionAdapter() {
+        if (radioDescriptionItemProvider == null) {
+            radioDescriptionItemProvider = new RadioDescriptionItemProvider(this);
+        }
+
+        return radioDescriptionItemProvider;
+    }
+
+    /**
      * This returns the root adapter factory that contains this factory. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
+    @Override
     public ComposeableAdapterFactory getRootAdapterFactory() {
         return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
     }
@@ -429,9 +455,10 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     /**
      * This sets the composed adapter factory that contains this factory. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
         this.parentAdapterFactory = parentAdapterFactory;
     }
@@ -479,6 +506,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * 
      * @generated
      */
+    @Override
     public void addListener(INotifyChangedListener notifyChangedListener) {
         changeNotifier.addListener(notifyChangedListener);
     }
@@ -488,6 +516,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * 
      * @generated
      */
+    @Override
     public void removeListener(INotifyChangedListener notifyChangedListener) {
         changeNotifier.removeListener(notifyChangedListener);
     }
@@ -496,9 +525,10 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
      * This delegates to {@link #changeNotifier} and to
      * {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      */
+    @Override
     public void fireNotifyChanged(Notification notification) {
         changeNotifier.fireNotifyChanged(notification);
 
@@ -510,42 +540,59 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     /**
      * This disposes all of the item providers created by this factory. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
+    @Override
     public void dispose() {
-        if (viewExtensionDescriptionItemProvider != null)
+        if (viewExtensionDescriptionItemProvider != null) {
             viewExtensionDescriptionItemProvider.dispose();
-        if (pageDescriptionItemProvider != null)
+        }
+        if (pageDescriptionItemProvider != null) {
             pageDescriptionItemProvider.dispose();
-        if (groupDescriptionItemProvider != null)
+        }
+        if (groupDescriptionItemProvider != null) {
             groupDescriptionItemProvider.dispose();
-        if (containerDescriptionItemProvider != null)
+        }
+        if (containerDescriptionItemProvider != null) {
             containerDescriptionItemProvider.dispose();
-        if (textDescriptionItemProvider != null)
+        }
+        if (textDescriptionItemProvider != null) {
             textDescriptionItemProvider.dispose();
-        if (buttonDescriptionItemProvider != null)
+        }
+        if (buttonDescriptionItemProvider != null) {
             buttonDescriptionItemProvider.dispose();
-        if (labelDescriptionItemProvider != null)
+        }
+        if (labelDescriptionItemProvider != null) {
             labelDescriptionItemProvider.dispose();
-        if (checkboxDescriptionItemProvider != null)
+        }
+        if (checkboxDescriptionItemProvider != null) {
             checkboxDescriptionItemProvider.dispose();
-        if (selectDescriptionItemProvider != null)
+        }
+        if (selectDescriptionItemProvider != null) {
             selectDescriptionItemProvider.dispose();
-        if (dynamicMappingForItemProvider != null)
+        }
+        if (dynamicMappingForItemProvider != null) {
             dynamicMappingForItemProvider.dispose();
-        if (dynamicMappingSwitchItemProvider != null)
+        }
+        if (dynamicMappingSwitchItemProvider != null) {
             dynamicMappingSwitchItemProvider.dispose();
-        if (dynamicMappingCaseItemProvider != null)
+        }
+        if (dynamicMappingCaseItemProvider != null) {
             dynamicMappingCaseItemProvider.dispose();
-        if (textAreaDescriptionItemProvider != null)
+        }
+        if (textAreaDescriptionItemProvider != null) {
             textAreaDescriptionItemProvider.dispose();
+        }
+        if (radioDescriptionItemProvider != null) {
+            radioDescriptionItemProvider.dispose();
+        }
     }
 
     /**
      * A child creation extender for the {@link DescriptionPackage}. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public static class DescriptionChildCreationExtender implements IChildCreationExtender {
@@ -611,6 +658,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
          * 
          * @generated
          */
+        @Override
         public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
             ArrayList<Object> result = new ArrayList<Object>();
             new CreationSwitch(result, editingDomain).doSwitch((EObject) object);
@@ -622,6 +670,7 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
          * 
          * @generated
          */
+        @Override
         public ResourceLocator getResourceLocator() {
             return PropertiesEditPlugin.INSTANCE;
         }
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java
new file mode 100644
index 0000000000..a04da70cbd
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java
@@ -0,0 +1,198 @@
+/**
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.sirius.properties.RadioDescription} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider {
+    /**
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    public RadioDescriptionItemProvider(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+    /**
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+        if (itemPropertyDescriptors == null) {
+            super.getPropertyDescriptors(object);
+
+            addValueExpressionPropertyDescriptor(object);
+            addCandidatesExpressionPropertyDescriptor(object);
+            addCandidateDisplayExpressionPropertyDescriptor(object);
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This adds a property descriptor for the Value Expression feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addValueExpressionPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_RadioDescription_valueExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_RadioDescription_valueExpression_feature", "_UI_RadioDescription_type"),
+                PropertiesPackage.Literals.RADIO_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Candidates Expression feature.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    protected void addCandidatesExpressionPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_RadioDescription_candidatesExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_RadioDescription_candidatesExpression_feature", "_UI_RadioDescription_type"),
+                PropertiesPackage.Literals.RADIO_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This adds a property descriptor for the Candidate Display Expression
+     * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    protected void addCandidateDisplayExpressionPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_RadioDescription_candidateDisplayExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_RadioDescription_candidateDisplayExpression_feature", "_UI_RadioDescription_type"),
+                PropertiesPackage.Literals.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+    }
+
+    /**
+     * This specifies how to implement {@link #getChildren} and is used to
+     * deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand},
+     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in
+     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+        if (childrenFeatures == null) {
+            super.getChildrenFeatures(object);
+            childrenFeatures.add(PropertiesPackage.Literals.RADIO_DESCRIPTION__INITIAL_OPERATION);
+        }
+        return childrenFeatures;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    protected EStructuralFeature getChildFeature(Object object, Object child) {
+        // Check the type of the specified child object and return the proper
+        // feature to use for
+        // adding (see {@link AddCommand}) it as a child.
+
+        return super.getChildFeature(object, child);
+    }
+
+    /**
+     * This returns RadioDescription.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/RadioDescription"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((RadioDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_RadioDescription_type") : getString("_UI_RadioDescription_type") + " " + label;
+    }
+
+    /**
+     * This handles model notifications by calling {@link #updateChildren} to
+     * update any cached children and by creating a viewer notification, which
+     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void notifyChanged(Notification notification) {
+        updateChildren(notification);
+
+        switch (notification.getFeatureID(RadioDescription.class)) {
+        case PropertiesPackage.RADIO_DESCRIPTION__VALUE_EXPRESSION:
+        case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATES_EXPRESSION:
+        case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        case PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+            return;
+        }
+        super.notifyChanged(notification);
+    }
+
+    /**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     */
+    @Override
+    protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.RADIO_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
+    }
+
+}
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
index db1c704450..7d8a0920c7 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -29,14 +29,14 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.SelectDescription} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public SelectDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -46,7 +46,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This returns the property descriptors for the adapted class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -64,7 +64,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
     /**
      * This adds a property descriptor for the Value Expression feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addValueExpressionPropertyDescriptor(Object object) {
@@ -185,7 +185,7 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java
index 2823507d3b..13f3e4d304 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -27,14 +27,14 @@ import org.eclipse.sirius.properties.TextAreaDescription;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.TextAreaDescription} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class TextAreaDescriptionItemProvider extends TextDescriptionItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public TextAreaDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -44,7 +44,7 @@ public class TextAreaDescriptionItemProvider extends TextDescriptionItemProvider
     /**
      * This returns the property descriptors for the adapted class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -60,7 +60,7 @@ public class TextAreaDescriptionItemProvider extends TextDescriptionItemProvider
     /**
      * This adds a property descriptor for the Line Count feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addLineCountPropertyDescriptor(Object object) {
@@ -116,7 +116,7 @@ public class TextAreaDescriptionItemProvider extends TextDescriptionItemProvider
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
index 9a1daee2c2..dcc7e1a16d 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -29,14 +29,14 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.TextDescription} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public TextDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -46,7 +46,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     /**
      * This returns the property descriptors for the adapted class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -62,7 +62,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     /**
      * This adds a property descriptor for the Value Expression feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addValueExpressionPropertyDescriptor(Object object) {
@@ -154,7 +154,7 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
index 45756528db..5ed6d98716 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -36,15 +36,15 @@ import org.eclipse.sirius.properties.ViewExtensionDescription;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.ViewExtensionDescription} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-        IItemPropertySource {
+IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public ViewExtensionDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -54,7 +54,7 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter im
     /**
      * This returns the property descriptors for the adapted class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -73,7 +73,7 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter im
     /**
      * This adds a property descriptor for the Identifier feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
@@ -86,7 +86,7 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter im
     /**
      * This adds a property descriptor for the Metamodels feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addMetamodelsPropertyDescriptor(Object object) {
@@ -99,7 +99,7 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter im
     /**
      * This adds a property descriptor for the Default Page feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addDefaultPagePropertyDescriptor(Object object) {
@@ -112,7 +112,7 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter im
     /**
      * This adds a property descriptor for the Label Expression feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
@@ -208,7 +208,7 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter im
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -223,7 +223,7 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter im
     /**
      * Return the resource locator for this item provider's resources. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
index 579c7b08f7..3ea0392b8d 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/WidgetDescriptionItemProvider.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -34,15 +34,15 @@ import org.eclipse.sirius.properties.WidgetDescription;
  * This is the item provider adapter for a
  * {@link org.eclipse.sirius.properties.WidgetDescription} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
- * 
+ *
  * @generated
  */
 public class WidgetDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-        IItemPropertySource {
+IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public WidgetDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -52,7 +52,7 @@ public class WidgetDescriptionItemProvider extends ItemProviderAdapter implement
     /**
      * This returns the property descriptors for the adapted class. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -69,7 +69,7 @@ public class WidgetDescriptionItemProvider extends ItemProviderAdapter implement
     /**
      * This adds a property descriptor for the Identifier feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
@@ -81,7 +81,7 @@ public class WidgetDescriptionItemProvider extends ItemProviderAdapter implement
     /**
      * This adds a property descriptor for the Label Expression feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
@@ -128,7 +128,7 @@ public class WidgetDescriptionItemProvider extends ItemProviderAdapter implement
      * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
      * describing the children that can be created under this object. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
@@ -139,7 +139,7 @@ public class WidgetDescriptionItemProvider extends ItemProviderAdapter implement
     /**
      * Return the resource locator for this item provider's resources. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     @Override
diff --git a/incubation/org.eclipse.sirius.properties/model/properties.ecore b/incubation/org.eclipse.sirius.properties/model/properties.ecore
index efcf0b75fa..a551e13121 100644
--- a/incubation/org.eclipse.sirius.properties/model/properties.ecore
+++ b/incubation/org.eclipse.sirius.properties/model/properties.ecore
@@ -122,4 +122,32 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineCount" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
         defaultValueLiteral="5"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RadioDescription" eSuperTypes="#//WidgetDescription">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Represents a radio button in the user interface."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The initial selected values of the radio."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="initialOperation" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/InitialOperation"
+        containment="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Defines the behavior executed when the end-user updates the value of the radio."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="candidatesExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Defines the various proposals available."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="candidateDisplayExpression"
+        eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Indicates how to display the input value."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/incubation/org.eclipse.sirius.properties/model/properties.genmodel b/incubation/org.eclipse.sirius.properties/model/properties.genmodel
index 41f936aa6f..da36a8a3f4 100644
--- a/incubation/org.eclipse.sirius.properties/model/properties.genmodel
+++ b/incubation/org.eclipse.sirius.properties/model/properties.genmodel
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016 Obeo.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA;   Obeo - initial API and implementation&#xA;"
-    modelDirectory="/org.eclipse.sirius.properties/src-gen" editDirectory="/org.eclipse.sirius.properties.edit/src-gen"
-    editorDirectory="/org.eclipse.sirius.properties.editor/src-gen" modelPluginID="org.eclipse.sirius.properties"
-    modelName="Properties" modelPluginClass="" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
-    runtimeVersion="2.3" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.sirius/model/viewpoint.genmodel#//viewpoint"
-    importOrganizing="true">
+    modelDirectory="/org.eclipse.sirius.properties/src-gen" creationIcons="false"
+    editDirectory="/org.eclipse.sirius.properties.edit/src-gen" editorDirectory=""
+    modelPluginID="org.eclipse.sirius.properties" modelName="Properties" modelPluginClass=""
+    editorPluginClass="" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    codeFormatting="true" testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="6.0" copyrightFields="false" editorPluginID="org.eclipse.sirius.properties.editor"
+    testsPluginID="org.eclipse.sirius.properties.editor" runtimeVersion="2.3" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.sirius/model/viewpoint.genmodel#//viewpoint"
+    importOrganizing="true" cleanup="true">
   <foreignModel>properties.ecore</foreignModel>
   <genPackages prefix="Properties" basePackage="org.eclipse.sirius" disposableProviderFactory="true"
       childCreationExtenders="true" ecorePackage="properties.ecore#/">
@@ -77,5 +79,11 @@
     <genClasses ecoreClass="properties.ecore#//TextAreaDescription">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//TextAreaDescription/lineCount"/>
     </genClasses>
+    <genClasses ecoreClass="properties.ecore#//RadioDescription">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//RadioDescription/valueExpression"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//RadioDescription/initialOperation"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//RadioDescription/candidatesExpression"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//RadioDescription/candidateDisplayExpression"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonDescription.java
index f44917a385..2e7bddf5eb 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonDescription.java
@@ -4,10 +4,10 @@
  * 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;
 
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java
index 8f82ff2f85..983f6636b3 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/CheckboxDescription.java
@@ -4,10 +4,10 @@
  * 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;
 
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java
index e2854e7c5c..7cf5d2d1f5 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ContainerDescription.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -44,7 +44,7 @@ public interface ContainerDescription extends EObject {
      * really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Identifier</em>' attribute.
      * @see #setIdentifier(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getContainerDescription_Identifier()
@@ -76,7 +76,7 @@ public interface ContainerDescription extends EObject {
      * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Widgets</em>' containment reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getContainerDescription_Widgets()
      * @model containment="true"
@@ -94,7 +94,7 @@ public interface ContainerDescription extends EObject {
      * list isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Dynamic Mappings</em>' containment
      *         reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getContainerDescription_DynamicMappings()
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingCase.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingCase.java
index 526a65e10d..6fdb3381d6 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingCase.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingCase.java
@@ -4,10 +4,10 @@
  * 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;
 
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java
index a36f5da2a7..29da3d81ef 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingFor.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -43,7 +43,7 @@ public interface DynamicMappingFor extends EObject {
      * really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Iterator</em>' attribute.
      * @see #setIterator(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getDynamicMappingFor_Iterator()
@@ -57,7 +57,7 @@ public interface DynamicMappingFor extends EObject {
      * {@link org.eclipse.sirius.properties.DynamicMappingFor#getIterator
      * <em>Iterator</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @param value
      *            the new value of the '<em>Iterator</em>' attribute.
      * @see #getIterator()
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingSwitch.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingSwitch.java
index 163b8288eb..4f160ea34a 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingSwitch.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/DynamicMappingSwitch.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -74,7 +74,7 @@ public interface DynamicMappingSwitch extends EObject {
      * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Cases</em>' containment reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getDynamicMappingSwitch_Cases()
      * @model containment="true" required="true"
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java
index 6b25099404..7c71d363be 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupDescription.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -47,7 +47,7 @@ public interface GroupDescription extends EObject {
      * really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Identifier</em>' attribute.
      * @see #setIdentifier(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupDescription_Identifier()
@@ -108,7 +108,7 @@ public interface GroupDescription extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Domain Class</em>' attribute.
      * @see #setDomainClass(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupDescription_DomainClass()
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java
index 45537fd783..0a42d9c044 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PageDescription.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -48,7 +48,7 @@ public interface PageDescription extends EObject {
      * really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Identifier</em>' attribute.
      * @see #setIdentifier(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getPageDescription_Identifier()
@@ -109,7 +109,7 @@ public interface PageDescription extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Domain Class</em>' attribute.
      * @see #setDomainClass(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getPageDescription_DomainClass()
@@ -174,7 +174,7 @@ public interface PageDescription extends EObject {
      * really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Groups</em>' reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getPageDescription_Groups()
      * @model
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
index 89e23c5d87..f7fe35d8dc 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesFactory.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -32,7 +32,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>View Extension Description</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>View Extension Description</em>'.
      * @generated
      */
@@ -41,7 +41,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Page Description</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Page Description</em>'.
      * @generated
      */
@@ -50,7 +50,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Group Description</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Group Description</em>'.
      * @generated
      */
@@ -59,7 +59,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Container Description</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Container Description</em>'.
      * @generated
      */
@@ -68,7 +68,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Text Description</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Text Description</em>'.
      * @generated
      */
@@ -77,7 +77,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Button Description</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Button Description</em>'.
      * @generated
      */
@@ -86,7 +86,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Label Description</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Label Description</em>'.
      * @generated
      */
@@ -95,7 +95,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Checkbox Description</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Checkbox Description</em>'.
      * @generated
      */
@@ -104,7 +104,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Select Description</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Select Description</em>'.
      * @generated
      */
@@ -113,7 +113,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Dynamic Mapping For</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Dynamic Mapping For</em>'.
      * @generated
      */
@@ -122,7 +122,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Dynamic Mapping Switch</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Dynamic Mapping Switch</em>'.
      * @generated
      */
@@ -131,7 +131,7 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Dynamic Mapping Case</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Dynamic Mapping Case</em>'.
      * @generated
      */
@@ -140,13 +140,22 @@ public interface PropertiesFactory extends EFactory {
     /**
      * Returns a new object of class '<em>Text Area Description</em>'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return a new object of class '<em>Text Area Description</em>'.
      * @generated
      */
     TextAreaDescription createTextAreaDescription();
 
     /**
+     * Returns a new object of class '<em>Radio Description</em>'. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @return a new object of class '<em>Radio Description</em>'.
+     * @generated
+     */
+    RadioDescription createRadioDescription();
+
+    /**
      * Returns the package supported by this factory. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * 
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
index 6d243c115b..1b07b10f3c 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/PropertiesPackage.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -77,7 +77,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -86,7 +86,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Metamodels</b></em>' reference list. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -104,7 +104,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Default Page</b></em>' reference. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -113,7 +113,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -153,7 +153,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -162,7 +162,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -171,7 +171,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Domain Class</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -189,7 +189,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Groups</b></em>' reference list. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -219,7 +219,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -228,7 +228,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -237,7 +237,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Domain Class</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -285,7 +285,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -333,7 +333,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -342,7 +342,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -372,29 +372,29 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int TEXT_DESCRIPTION__IDENTIFIER = WIDGET_DESCRIPTION__IDENTIFIER;
+    int TEXT_DESCRIPTION__IDENTIFIER = PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER;
 
     /**
      * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int TEXT_DESCRIPTION__LABEL_EXPRESSION = WIDGET_DESCRIPTION__LABEL_EXPRESSION;
+    int TEXT_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION;
 
     /**
      * The feature id for the '<em><b>Value Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int TEXT_DESCRIPTION__VALUE_EXPRESSION = WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
+    int TEXT_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment
@@ -403,7 +403,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TEXT_DESCRIPTION__INITIAL_OPERATION = WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
+    int TEXT_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
 
     /**
      * The number of structural features of the '<em>Text Description</em>'
@@ -412,7 +412,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TEXT_DESCRIPTION_FEATURE_COUNT = WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+    int TEXT_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
 
     /**
      * The meta object id for the '
@@ -429,20 +429,20 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int BUTTON_DESCRIPTION__IDENTIFIER = WIDGET_DESCRIPTION__IDENTIFIER;
+    int BUTTON_DESCRIPTION__IDENTIFIER = PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER;
 
     /**
      * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int BUTTON_DESCRIPTION__LABEL_EXPRESSION = WIDGET_DESCRIPTION__LABEL_EXPRESSION;
+    int BUTTON_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION;
 
     /**
      * The feature id for the '<em><b>Button Label Expression</b></em>'
@@ -451,7 +451,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION = WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
+    int BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment
@@ -460,7 +460,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int BUTTON_DESCRIPTION__INITIAL_OPERATION = WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
+    int BUTTON_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
 
     /**
      * The number of structural features of the '<em>Button Description</em>'
@@ -469,7 +469,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int BUTTON_DESCRIPTION_FEATURE_COUNT = WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+    int BUTTON_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
 
     /**
      * The meta object id for the '
@@ -486,20 +486,20 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int LABEL_DESCRIPTION__IDENTIFIER = WIDGET_DESCRIPTION__IDENTIFIER;
+    int LABEL_DESCRIPTION__IDENTIFIER = PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER;
 
     /**
      * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int LABEL_DESCRIPTION__LABEL_EXPRESSION = WIDGET_DESCRIPTION__LABEL_EXPRESSION;
+    int LABEL_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION;
 
     /**
      * The number of structural features of the '<em>Label Description</em>'
@@ -508,7 +508,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int LABEL_DESCRIPTION_FEATURE_COUNT = WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
+    int LABEL_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
 
     /**
      * The meta object id for the '
@@ -525,29 +525,29 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int CHECKBOX_DESCRIPTION__IDENTIFIER = WIDGET_DESCRIPTION__IDENTIFIER;
+    int CHECKBOX_DESCRIPTION__IDENTIFIER = PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER;
 
     /**
      * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int CHECKBOX_DESCRIPTION__LABEL_EXPRESSION = WIDGET_DESCRIPTION__LABEL_EXPRESSION;
+    int CHECKBOX_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION;
 
     /**
      * The feature id for the '<em><b>Value Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int CHECKBOX_DESCRIPTION__VALUE_EXPRESSION = WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
+    int CHECKBOX_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment
@@ -556,7 +556,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CHECKBOX_DESCRIPTION__INITIAL_OPERATION = WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
+    int CHECKBOX_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
 
     /**
      * The number of structural features of the '<em>Checkbox Description</em>'
@@ -565,7 +565,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int CHECKBOX_DESCRIPTION_FEATURE_COUNT = WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+    int CHECKBOX_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
 
     /**
      * The meta object id for the '
@@ -582,29 +582,29 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int SELECT_DESCRIPTION__IDENTIFIER = WIDGET_DESCRIPTION__IDENTIFIER;
+    int SELECT_DESCRIPTION__IDENTIFIER = PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER;
 
     /**
      * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int SELECT_DESCRIPTION__LABEL_EXPRESSION = WIDGET_DESCRIPTION__LABEL_EXPRESSION;
+    int SELECT_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION;
 
     /**
      * The feature id for the '<em><b>Value Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int SELECT_DESCRIPTION__VALUE_EXPRESSION = WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
+    int SELECT_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment
@@ -613,7 +613,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_DESCRIPTION__INITIAL_OPERATION = WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
+    int SELECT_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Candidates Expression</b></em>' attribute.
@@ -622,7 +622,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_DESCRIPTION__CANDIDATES_EXPRESSION = WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+    int SELECT_DESCRIPTION__CANDIDATES_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Candidate Display Expression</b></em>'
@@ -631,7 +631,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION = WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
+    int SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
 
     /**
      * The number of structural features of the '<em>Select Description</em>'
@@ -640,7 +640,7 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int SELECT_DESCRIPTION_FEATURE_COUNT = WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
+    int SELECT_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
 
     /**
      * The meta object id for the '
@@ -657,7 +657,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Iterator</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -744,7 +744,7 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Case Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -783,29 +783,29 @@ public interface PropertiesPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int TEXT_AREA_DESCRIPTION__IDENTIFIER = TEXT_DESCRIPTION__IDENTIFIER;
+    int TEXT_AREA_DESCRIPTION__IDENTIFIER = PropertiesPackage.TEXT_DESCRIPTION__IDENTIFIER;
 
     /**
      * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int TEXT_AREA_DESCRIPTION__LABEL_EXPRESSION = TEXT_DESCRIPTION__LABEL_EXPRESSION;
+    int TEXT_AREA_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.TEXT_DESCRIPTION__LABEL_EXPRESSION;
 
     /**
      * The feature id for the '<em><b>Value Expression</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int TEXT_AREA_DESCRIPTION__VALUE_EXPRESSION = TEXT_DESCRIPTION__VALUE_EXPRESSION;
+    int TEXT_AREA_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION;
 
     /**
      * The feature id for the '<em><b>Initial Operation</b></em>' containment
@@ -814,16 +814,16 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TEXT_AREA_DESCRIPTION__INITIAL_OPERATION = TEXT_DESCRIPTION__INITIAL_OPERATION;
+    int TEXT_AREA_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION;
 
     /**
      * The feature id for the '<em><b>Line Count</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      * @ordered
      */
-    int TEXT_AREA_DESCRIPTION__LINE_COUNT = TEXT_DESCRIPTION_FEATURE_COUNT + 0;
+    int TEXT_AREA_DESCRIPTION__LINE_COUNT = PropertiesPackage.TEXT_DESCRIPTION_FEATURE_COUNT + 0;
 
     /**
      * The number of structural features of the '<em>Text Area Description</em>'
@@ -832,14 +832,84 @@ public interface PropertiesPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TEXT_AREA_DESCRIPTION_FEATURE_COUNT = TEXT_DESCRIPTION_FEATURE_COUNT + 1;
+    int TEXT_AREA_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.TEXT_DESCRIPTION_FEATURE_COUNT + 1;
 
     /**
-     * Returns the meta object for class '
-     * {@link org.eclipse.sirius.properties.ViewExtensionDescription
-     * <em>View Extension Description</em>}'. <!-- begin-user-doc --> <!--
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.RadioDescriptionImpl
+     * <em>Radio Description</em>}' class. <!-- begin-user-doc --> <!--
      * end-user-doc -->
      * 
+     * @see org.eclipse.sirius.properties.impl.RadioDescriptionImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getRadioDescription()
+     * @generated
+     */
+    int RADIO_DESCRIPTION = 14;
+
+    /**
+     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RADIO_DESCRIPTION__IDENTIFIER = PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER;
+
+    /**
+     * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RADIO_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION;
+
+    /**
+     * The feature id for the '<em><b>Value Expression</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int RADIO_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
+
+    /**
+     * The feature id for the '<em><b>Initial Operation</b></em>' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int RADIO_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
+
+    /**
+     * The feature id for the '<em><b>Candidates Expression</b></em>' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int RADIO_DESCRIPTION__CANDIDATES_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+
+    /**
+     * The feature id for the '<em><b>Candidate Display Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
+
+    /**
+     * The number of structural features of the '<em>Radio Description</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int RADIO_DESCRIPTION_FEATURE_COUNT = PropertiesPackage.WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
+
+    /**
      * @return the meta object for class '<em>View Extension Description</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription
      * @generated
@@ -900,7 +970,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getLabelExpression
      * <em>Label Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Label Expression</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getLabelExpression()
      * @see #getViewExtensionDescription()
@@ -926,7 +996,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.PageDescription
      * <em>Page Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for class '<em>Page Description</em>'.
      * @see org.eclipse.sirius.properties.PageDescription
      * @generated
@@ -950,7 +1020,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.PageDescription#getLabelExpression
      * <em>Label Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Label Expression</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getLabelExpression()
      * @see #getPageDescription()
@@ -1001,7 +1071,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.GroupDescription
      * <em>Group Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for class '<em>Group Description</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription
      * @generated
@@ -1025,7 +1095,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.GroupDescription#getLabelExpression
      * <em>Label Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Label Expression</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription#getLabelExpression()
      * @see #getGroupDescription()
@@ -1114,7 +1184,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.ContainerDescription#getDynamicMappings
      * <em>Dynamic Mappings</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the containment reference list '
      *         <em>Dynamic Mappings</em>'.
      * @see org.eclipse.sirius.properties.ContainerDescription#getDynamicMappings()
@@ -1128,7 +1198,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.WidgetDescription
      * <em>Widget Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for class '<em>Widget Description</em>'.
      * @see org.eclipse.sirius.properties.WidgetDescription
      * @generated
@@ -1152,7 +1222,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.WidgetDescription#getLabelExpression
      * <em>Label Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Label Expression</em>'.
      * @see org.eclipse.sirius.properties.WidgetDescription#getLabelExpression()
      * @see #getWidgetDescription()
@@ -1165,7 +1235,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.TextDescription
      * <em>Text Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for class '<em>Text Description</em>'.
      * @see org.eclipse.sirius.properties.TextDescription
      * @generated
@@ -1177,7 +1247,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.TextDescription#getValueExpression
      * <em>Value Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Value Expression</em>'.
      * @see org.eclipse.sirius.properties.TextDescription#getValueExpression()
      * @see #getTextDescription()
@@ -1190,7 +1260,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.TextDescription#getInitialOperation
      * <em>Initial Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the containment reference '
      *         <em>Initial Operation</em>'.
      * @see org.eclipse.sirius.properties.TextDescription#getInitialOperation()
@@ -1204,7 +1274,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.ButtonDescription
      * <em>Button Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for class '<em>Button Description</em>'.
      * @see org.eclipse.sirius.properties.ButtonDescription
      * @generated
@@ -1230,7 +1300,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.ButtonDescription#getInitialOperation
      * <em>Initial Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the containment reference '
      *         <em>Initial Operation</em>'.
      * @see org.eclipse.sirius.properties.ButtonDescription#getInitialOperation()
@@ -1244,7 +1314,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.LabelDescription
      * <em>Label Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for class '<em>Label Description</em>'.
      * @see org.eclipse.sirius.properties.LabelDescription
      * @generated
@@ -1268,7 +1338,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.CheckboxDescription#getValueExpression
      * <em>Value Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Value Expression</em>'.
      * @see org.eclipse.sirius.properties.CheckboxDescription#getValueExpression()
      * @see #getCheckboxDescription()
@@ -1281,7 +1351,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.CheckboxDescription#getInitialOperation
      * <em>Initial Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the containment reference '
      *         <em>Initial Operation</em>'.
      * @see org.eclipse.sirius.properties.CheckboxDescription#getInitialOperation()
@@ -1295,7 +1365,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.SelectDescription
      * <em>Select Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for class '<em>Select Description</em>'.
      * @see org.eclipse.sirius.properties.SelectDescription
      * @generated
@@ -1307,7 +1377,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.SelectDescription#getValueExpression
      * <em>Value Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Value Expression</em>'.
      * @see org.eclipse.sirius.properties.SelectDescription#getValueExpression()
      * @see #getSelectDescription()
@@ -1320,7 +1390,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.SelectDescription#getInitialOperation
      * <em>Initial Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the containment reference '
      *         <em>Initial Operation</em>'.
      * @see org.eclipse.sirius.properties.SelectDescription#getInitialOperation()
@@ -1362,7 +1432,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.DynamicMappingFor
      * <em>Dynamic Mapping For</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for class '<em>Dynamic Mapping For</em>'.
      * @see org.eclipse.sirius.properties.DynamicMappingFor
      * @generated
@@ -1424,7 +1494,7 @@ public interface PropertiesPackage extends EPackage {
      * {@link org.eclipse.sirius.properties.DynamicMappingSwitch#getSwitchExpression
      * <em>Switch Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Switch Expression</em>'.
      * @see org.eclipse.sirius.properties.DynamicMappingSwitch#getSwitchExpression()
      * @see #getDynamicMappingSwitch()
@@ -1506,9 +1576,73 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getTextAreaDescription_LineCount();
 
     /**
-     * Returns the factory that creates the instances of the model. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.RadioDescription
+     * <em>Radio Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for class '<em>Radio Description</em>'.
+     * @see org.eclipse.sirius.properties.RadioDescription
+     * @generated
+     */
+    EClass getRadioDescription();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.RadioDescription#getValueExpression
+     * <em>Value Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the attribute '<em>Value Expression</em>'.
+     * @see org.eclipse.sirius.properties.RadioDescription#getValueExpression()
+     * @see #getRadioDescription()
+     * @generated
+     */
+    EAttribute getRadioDescription_ValueExpression();
+
+    /**
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.RadioDescription#getInitialOperation
+     * <em>Initial Operation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     *
+     * @return the meta object for the containment reference '
+     *         <em>Initial Operation</em>'.
+     * @see org.eclipse.sirius.properties.RadioDescription#getInitialOperation()
+     * @see #getRadioDescription()
+     * @generated
+     */
+    EReference getRadioDescription_InitialOperation();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.RadioDescription#getCandidatesExpression
+     * <em>Candidates Expression</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the meta object for the attribute '<em>Candidates Expression</em>
+     *         '.
+     * @see org.eclipse.sirius.properties.RadioDescription#getCandidatesExpression()
+     * @see #getRadioDescription()
+     * @generated
+     */
+    EAttribute getRadioDescription_CandidatesExpression();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.RadioDescription#getCandidateDisplayExpression
+     * <em>Candidate Display Expression</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
      * 
+     * @return the meta object for the attribute '
+     *         <em>Candidate Display Expression</em>'.
+     * @see org.eclipse.sirius.properties.RadioDescription#getCandidateDisplayExpression()
+     * @see #getRadioDescription()
+     * @generated
+     */
+    EAttribute getRadioDescription_CandidateDisplayExpression();
+
+    /**
      * @return the factory that creates the instances of the model.
      * @generated
      */
@@ -1538,7 +1672,7 @@ public interface PropertiesPackage extends EPackage {
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getViewExtensionDescription()
          * @generated
          */
-        EClass VIEW_EXTENSION_DESCRIPTION = eINSTANCE.getViewExtensionDescription();
+        EClass VIEW_EXTENSION_DESCRIPTION = PropertiesPackage.eINSTANCE.getViewExtensionDescription();
 
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>'
@@ -1546,7 +1680,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute VIEW_EXTENSION_DESCRIPTION__IDENTIFIER = eINSTANCE.getViewExtensionDescription_Identifier();
+        EAttribute VIEW_EXTENSION_DESCRIPTION__IDENTIFIER = PropertiesPackage.eINSTANCE.getViewExtensionDescription_Identifier();
 
         /**
          * The meta object literal for the '<em><b>Metamodels</b></em>'
@@ -1554,7 +1688,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference VIEW_EXTENSION_DESCRIPTION__METAMODELS = eINSTANCE.getViewExtensionDescription_Metamodels();
+        EReference VIEW_EXTENSION_DESCRIPTION__METAMODELS = PropertiesPackage.eINSTANCE.getViewExtensionDescription_Metamodels();
 
         /**
          * The meta object literal for the '<em><b>Pages</b></em>' containment
@@ -1562,7 +1696,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference VIEW_EXTENSION_DESCRIPTION__PAGES = eINSTANCE.getViewExtensionDescription_Pages();
+        EReference VIEW_EXTENSION_DESCRIPTION__PAGES = PropertiesPackage.eINSTANCE.getViewExtensionDescription_Pages();
 
         /**
          * The meta object literal for the '<em><b>Default Page</b></em>'
@@ -1570,7 +1704,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE = eINSTANCE.getViewExtensionDescription_DefaultPage();
+        EReference VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE = PropertiesPackage.eINSTANCE.getViewExtensionDescription_DefaultPage();
 
         /**
          * The meta object literal for the '<em><b>Label Expression</b></em>'
@@ -1578,7 +1712,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION = eINSTANCE.getViewExtensionDescription_LabelExpression();
+        EAttribute VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.eINSTANCE.getViewExtensionDescription_LabelExpression();
 
         /**
          * The meta object literal for the '<em><b>Groups</b></em>' containment
@@ -1586,7 +1720,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference VIEW_EXTENSION_DESCRIPTION__GROUPS = eINSTANCE.getViewExtensionDescription_Groups();
+        EReference VIEW_EXTENSION_DESCRIPTION__GROUPS = PropertiesPackage.eINSTANCE.getViewExtensionDescription_Groups();
 
         /**
          * The meta object literal for the '
@@ -1598,7 +1732,7 @@ public interface PropertiesPackage extends EPackage {
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getPageDescription()
          * @generated
          */
-        EClass PAGE_DESCRIPTION = eINSTANCE.getPageDescription();
+        EClass PAGE_DESCRIPTION = PropertiesPackage.eINSTANCE.getPageDescription();
 
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>'
@@ -1606,7 +1740,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute PAGE_DESCRIPTION__IDENTIFIER = eINSTANCE.getPageDescription_Identifier();
+        EAttribute PAGE_DESCRIPTION__IDENTIFIER = PropertiesPackage.eINSTANCE.getPageDescription_Identifier();
 
         /**
          * The meta object literal for the '<em><b>Label Expression</b></em>'
@@ -1614,7 +1748,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute PAGE_DESCRIPTION__LABEL_EXPRESSION = eINSTANCE.getPageDescription_LabelExpression();
+        EAttribute PAGE_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.eINSTANCE.getPageDescription_LabelExpression();
 
         /**
          * The meta object literal for the '<em><b>Domain Class</b></em>'
@@ -1622,7 +1756,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute PAGE_DESCRIPTION__DOMAIN_CLASS = eINSTANCE.getPageDescription_DomainClass();
+        EAttribute PAGE_DESCRIPTION__DOMAIN_CLASS = PropertiesPackage.eINSTANCE.getPageDescription_DomainClass();
 
         /**
          * The meta object literal for the '
@@ -1631,7 +1765,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION = eINSTANCE.getPageDescription_SemanticCandidateExpression();
+        EAttribute PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION = PropertiesPackage.eINSTANCE.getPageDescription_SemanticCandidateExpression();
 
         /**
          * The meta object literal for the '<em><b>Groups</b></em>' reference
@@ -1639,7 +1773,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference PAGE_DESCRIPTION__GROUPS = eINSTANCE.getPageDescription_Groups();
+        EReference PAGE_DESCRIPTION__GROUPS = PropertiesPackage.eINSTANCE.getPageDescription_Groups();
 
         /**
          * The meta object literal for the '
@@ -1651,7 +1785,7 @@ public interface PropertiesPackage extends EPackage {
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getGroupDescription()
          * @generated
          */
-        EClass GROUP_DESCRIPTION = eINSTANCE.getGroupDescription();
+        EClass GROUP_DESCRIPTION = PropertiesPackage.eINSTANCE.getGroupDescription();
 
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>'
@@ -1659,7 +1793,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute GROUP_DESCRIPTION__IDENTIFIER = eINSTANCE.getGroupDescription_Identifier();
+        EAttribute GROUP_DESCRIPTION__IDENTIFIER = PropertiesPackage.eINSTANCE.getGroupDescription_Identifier();
 
         /**
          * The meta object literal for the '<em><b>Label Expression</b></em>'
@@ -1667,7 +1801,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute GROUP_DESCRIPTION__LABEL_EXPRESSION = eINSTANCE.getGroupDescription_LabelExpression();
+        EAttribute GROUP_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.eINSTANCE.getGroupDescription_LabelExpression();
 
         /**
          * The meta object literal for the '<em><b>Domain Class</b></em>'
@@ -1675,7 +1809,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute GROUP_DESCRIPTION__DOMAIN_CLASS = eINSTANCE.getGroupDescription_DomainClass();
+        EAttribute GROUP_DESCRIPTION__DOMAIN_CLASS = PropertiesPackage.eINSTANCE.getGroupDescription_DomainClass();
 
         /**
          * The meta object literal for the '
@@ -1684,7 +1818,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION = eINSTANCE.getGroupDescription_SemanticCandidateExpression();
+        EAttribute GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION = PropertiesPackage.eINSTANCE.getGroupDescription_SemanticCandidateExpression();
 
         /**
          * The meta object literal for the '<em><b>Container</b></em>'
@@ -1693,7 +1827,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference GROUP_DESCRIPTION__CONTAINER = eINSTANCE.getGroupDescription_Container();
+        EReference GROUP_DESCRIPTION__CONTAINER = PropertiesPackage.eINSTANCE.getGroupDescription_Container();
 
         /**
          * The meta object literal for the '
@@ -1705,7 +1839,7 @@ public interface PropertiesPackage extends EPackage {
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getContainerDescription()
          * @generated
          */
-        EClass CONTAINER_DESCRIPTION = eINSTANCE.getContainerDescription();
+        EClass CONTAINER_DESCRIPTION = PropertiesPackage.eINSTANCE.getContainerDescription();
 
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>'
@@ -1713,7 +1847,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute CONTAINER_DESCRIPTION__IDENTIFIER = eINSTANCE.getContainerDescription_Identifier();
+        EAttribute CONTAINER_DESCRIPTION__IDENTIFIER = PropertiesPackage.eINSTANCE.getContainerDescription_Identifier();
 
         /**
          * The meta object literal for the '<em><b>Widgets</b></em>' containment
@@ -1721,7 +1855,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference CONTAINER_DESCRIPTION__WIDGETS = eINSTANCE.getContainerDescription_Widgets();
+        EReference CONTAINER_DESCRIPTION__WIDGETS = PropertiesPackage.eINSTANCE.getContainerDescription_Widgets();
 
         /**
          * The meta object literal for the '<em><b>Dynamic Mappings</b></em>'
@@ -1730,7 +1864,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS = eINSTANCE.getContainerDescription_DynamicMappings();
+        EReference CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS = PropertiesPackage.eINSTANCE.getContainerDescription_DynamicMappings();
 
         /**
          * The meta object literal for the '
@@ -1742,7 +1876,7 @@ public interface PropertiesPackage extends EPackage {
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getWidgetDescription()
          * @generated
          */
-        EClass WIDGET_DESCRIPTION = eINSTANCE.getWidgetDescription();
+        EClass WIDGET_DESCRIPTION = PropertiesPackage.eINSTANCE.getWidgetDescription();
 
         /**
          * The meta object literal for the '<em><b>Identifier</b></em>'
@@ -1750,7 +1884,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute WIDGET_DESCRIPTION__IDENTIFIER = eINSTANCE.getWidgetDescription_Identifier();
+        EAttribute WIDGET_DESCRIPTION__IDENTIFIER = PropertiesPackage.eINSTANCE.getWidgetDescription_Identifier();
 
         /**
          * The meta object literal for the '<em><b>Label Expression</b></em>'
@@ -1758,7 +1892,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute WIDGET_DESCRIPTION__LABEL_EXPRESSION = eINSTANCE.getWidgetDescription_LabelExpression();
+        EAttribute WIDGET_DESCRIPTION__LABEL_EXPRESSION = PropertiesPackage.eINSTANCE.getWidgetDescription_LabelExpression();
 
         /**
          * The meta object literal for the '
@@ -1770,7 +1904,7 @@ public interface PropertiesPackage extends EPackage {
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextDescription()
          * @generated
          */
-        EClass TEXT_DESCRIPTION = eINSTANCE.getTextDescription();
+        EClass TEXT_DESCRIPTION = PropertiesPackage.eINSTANCE.getTextDescription();
 
         /**
          * The meta object literal for the '<em><b>Value Expression</b></em>'
@@ -1778,7 +1912,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute TEXT_DESCRIPTION__VALUE_EXPRESSION = eINSTANCE.getTextDescription_ValueExpression();
+        EAttribute TEXT_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.eINSTANCE.getTextDescription_ValueExpression();
 
         /**
          * The meta object literal for the '<em><b>Initial Operation</b></em>'
@@ -1787,7 +1921,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference TEXT_DESCRIPTION__INITIAL_OPERATION = eINSTANCE.getTextDescription_InitialOperation();
+        EReference TEXT_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getTextDescription_InitialOperation();
 
         /**
          * The meta object literal for the '
@@ -1799,16 +1933,16 @@ public interface PropertiesPackage extends EPackage {
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getButtonDescription()
          * @generated
          */
-        EClass BUTTON_DESCRIPTION = eINSTANCE.getButtonDescription();
+        EClass BUTTON_DESCRIPTION = PropertiesPackage.eINSTANCE.getButtonDescription();
 
         /**
          * The meta object literal for the '
          * <em><b>Button Label Expression</b></em>' attribute feature. <!--
          * begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EAttribute BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION = eINSTANCE.getButtonDescription_ButtonLabelExpression();
+        EAttribute BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION = PropertiesPackage.eINSTANCE.getButtonDescription_ButtonLabelExpression();
 
         /**
          * The meta object literal for the '<em><b>Initial Operation</b></em>'
@@ -1817,7 +1951,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference BUTTON_DESCRIPTION__INITIAL_OPERATION = eINSTANCE.getButtonDescription_InitialOperation();
+        EReference BUTTON_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getButtonDescription_InitialOperation();
 
         /**
          * The meta object literal for the '
@@ -1829,7 +1963,7 @@ public interface PropertiesPackage extends EPackage {
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getLabelDescription()
          * @generated
          */
-        EClass LABEL_DESCRIPTION = eINSTANCE.getLabelDescription();
+        EClass LABEL_DESCRIPTION = PropertiesPackage.eINSTANCE.getLabelDescription();
 
         /**
          * The meta object literal for the '
@@ -1841,7 +1975,7 @@ public interface PropertiesPackage extends EPackage {
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCheckboxDescription()
          * @generated
          */
-        EClass CHECKBOX_DESCRIPTION = eINSTANCE.getCheckboxDescription();
+        EClass CHECKBOX_DESCRIPTION = PropertiesPackage.eINSTANCE.getCheckboxDescription();
 
         /**
          * The meta object literal for the '<em><b>Value Expression</b></em>'
@@ -1849,7 +1983,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute CHECKBOX_DESCRIPTION__VALUE_EXPRESSION = eINSTANCE.getCheckboxDescription_ValueExpression();
+        EAttribute CHECKBOX_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.eINSTANCE.getCheckboxDescription_ValueExpression();
 
         /**
          * The meta object literal for the '<em><b>Initial Operation</b></em>'
@@ -1858,7 +1992,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference CHECKBOX_DESCRIPTION__INITIAL_OPERATION = eINSTANCE.getCheckboxDescription_InitialOperation();
+        EReference CHECKBOX_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getCheckboxDescription_InitialOperation();
 
         /**
          * The meta object literal for the '
@@ -1870,7 +2004,7 @@ public interface PropertiesPackage extends EPackage {
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSelectDescription()
          * @generated
          */
-        EClass SELECT_DESCRIPTION = eINSTANCE.getSelectDescription();
+        EClass SELECT_DESCRIPTION = PropertiesPackage.eINSTANCE.getSelectDescription();
 
         /**
          * The meta object literal for the '<em><b>Value Expression</b></em>'
@@ -1878,7 +2012,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute SELECT_DESCRIPTION__VALUE_EXPRESSION = eINSTANCE.getSelectDescription_ValueExpression();
+        EAttribute SELECT_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.eINSTANCE.getSelectDescription_ValueExpression();
 
         /**
          * The meta object literal for the '<em><b>Initial Operation</b></em>'
@@ -1887,25 +2021,25 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference SELECT_DESCRIPTION__INITIAL_OPERATION = eINSTANCE.getSelectDescription_InitialOperation();
+        EReference SELECT_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getSelectDescription_InitialOperation();
 
         /**
          * The meta object literal for the '
          * <em><b>Candidates Expression</b></em>' attribute feature. <!--
          * begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EAttribute SELECT_DESCRIPTION__CANDIDATES_EXPRESSION = eINSTANCE.getSelectDescription_CandidatesExpression();
+        EAttribute SELECT_DESCRIPTION__CANDIDATES_EXPRESSION = PropertiesPackage.eINSTANCE.getSelectDescription_CandidatesExpression();
 
         /**
          * The meta object literal for the '
          * <em><b>Candidate Display Expression</b></em>' attribute feature. <!--
          * begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EAttribute SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION = eINSTANCE.getSelectDescription_CandidateDisplayExpression();
+        EAttribute SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION = PropertiesPackage.eINSTANCE.getSelectDescription_CandidateDisplayExpression();
 
         /**
          * The meta object literal for the '
@@ -1917,7 +2051,7 @@ public interface PropertiesPackage extends EPackage {
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getDynamicMappingFor()
          * @generated
          */
-        EClass DYNAMIC_MAPPING_FOR = eINSTANCE.getDynamicMappingFor();
+        EClass DYNAMIC_MAPPING_FOR = PropertiesPackage.eINSTANCE.getDynamicMappingFor();
 
         /**
          * The meta object literal for the '<em><b>Iterator</b></em>' attribute
@@ -1925,16 +2059,16 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute DYNAMIC_MAPPING_FOR__ITERATOR = eINSTANCE.getDynamicMappingFor_Iterator();
+        EAttribute DYNAMIC_MAPPING_FOR__ITERATOR = PropertiesPackage.eINSTANCE.getDynamicMappingFor_Iterator();
 
         /**
          * The meta object literal for the '
          * <em><b>Domain Class Expression</b></em>' attribute feature. <!--
          * begin-user-doc --> <!-- end-user-doc -->
-         * 
+         *
          * @generated
          */
-        EAttribute DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION = eINSTANCE.getDynamicMappingFor_DomainClassExpression();
+        EAttribute DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION = PropertiesPackage.eINSTANCE.getDynamicMappingFor_DomainClassExpression();
 
         /**
          * The meta object literal for the '<em><b>Switch</b></em>' containment
@@ -1942,7 +2076,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference DYNAMIC_MAPPING_FOR__SWITCH = eINSTANCE.getDynamicMappingFor_Switch();
+        EReference DYNAMIC_MAPPING_FOR__SWITCH = PropertiesPackage.eINSTANCE.getDynamicMappingFor_Switch();
 
         /**
          * The meta object literal for the '
@@ -1954,7 +2088,7 @@ public interface PropertiesPackage extends EPackage {
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getDynamicMappingSwitch()
          * @generated
          */
-        EClass DYNAMIC_MAPPING_SWITCH = eINSTANCE.getDynamicMappingSwitch();
+        EClass DYNAMIC_MAPPING_SWITCH = PropertiesPackage.eINSTANCE.getDynamicMappingSwitch();
 
         /**
          * The meta object literal for the '<em><b>Switch Expression</b></em>'
@@ -1962,7 +2096,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION = eINSTANCE.getDynamicMappingSwitch_SwitchExpression();
+        EAttribute DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION = PropertiesPackage.eINSTANCE.getDynamicMappingSwitch_SwitchExpression();
 
         /**
          * The meta object literal for the '<em><b>Cases</b></em>' containment
@@ -1970,7 +2104,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference DYNAMIC_MAPPING_SWITCH__CASES = eINSTANCE.getDynamicMappingSwitch_Cases();
+        EReference DYNAMIC_MAPPING_SWITCH__CASES = PropertiesPackage.eINSTANCE.getDynamicMappingSwitch_Cases();
 
         /**
          * The meta object literal for the '
@@ -1982,7 +2116,7 @@ public interface PropertiesPackage extends EPackage {
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getDynamicMappingCase()
          * @generated
          */
-        EClass DYNAMIC_MAPPING_CASE = eINSTANCE.getDynamicMappingCase();
+        EClass DYNAMIC_MAPPING_CASE = PropertiesPackage.eINSTANCE.getDynamicMappingCase();
 
         /**
          * The meta object literal for the '<em><b>Case Expression</b></em>'
@@ -1990,7 +2124,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute DYNAMIC_MAPPING_CASE__CASE_EXPRESSION = eINSTANCE.getDynamicMappingCase_CaseExpression();
+        EAttribute DYNAMIC_MAPPING_CASE__CASE_EXPRESSION = PropertiesPackage.eINSTANCE.getDynamicMappingCase_CaseExpression();
 
         /**
          * The meta object literal for the '<em><b>Widget</b></em>' containment
@@ -1998,7 +2132,54 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EReference DYNAMIC_MAPPING_CASE__WIDGET = eINSTANCE.getDynamicMappingCase_Widget();
+        EReference DYNAMIC_MAPPING_CASE__WIDGET = PropertiesPackage.eINSTANCE.getDynamicMappingCase_Widget();
+
+        /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.RadioDescriptionImpl
+         * <em>Radio Description</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @see org.eclipse.sirius.properties.impl.RadioDescriptionImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getRadioDescription()
+         * @generated
+         */
+        EClass RADIO_DESCRIPTION = PropertiesPackage.eINSTANCE.getRadioDescription();
+
+        /**
+         * The meta object literal for the '<em><b>Value Expression</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
+         * @generated
+         */
+        EAttribute RADIO_DESCRIPTION__VALUE_EXPRESSION = PropertiesPackage.eINSTANCE.getRadioDescription_ValueExpression();
+
+        /**
+         * The meta object literal for the '<em><b>Initial Operation</b></em>'
+         * containment reference feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @generated
+         */
+        EReference RADIO_DESCRIPTION__INITIAL_OPERATION = PropertiesPackage.eINSTANCE.getRadioDescription_InitialOperation();
+
+        /**
+         * The meta object literal for the '
+         * <em><b>Candidates Expression</b></em>' attribute feature. <!--
+         * begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EAttribute RADIO_DESCRIPTION__CANDIDATES_EXPRESSION = PropertiesPackage.eINSTANCE.getRadioDescription_CandidatesExpression();
+
+        /**
+         * The meta object literal for the '
+         * <em><b>Candidate Display Expression</b></em>' attribute feature. <!--
+         * begin-user-doc --> <!-- end-user-doc -->
+         *
+         * @generated
+         */
+        EAttribute RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION = PropertiesPackage.eINSTANCE.getRadioDescription_CandidateDisplayExpression();
 
         /**
          * The meta object literal for the '
@@ -2010,7 +2191,7 @@ public interface PropertiesPackage extends EPackage {
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextAreaDescription()
          * @generated
          */
-        EClass TEXT_AREA_DESCRIPTION = eINSTANCE.getTextAreaDescription();
+        EClass TEXT_AREA_DESCRIPTION = PropertiesPackage.eINSTANCE.getTextAreaDescription();
 
         /**
          * The meta object literal for the '<em><b>Line Count</b></em>'
@@ -2018,7 +2199,7 @@ public interface PropertiesPackage extends EPackage {
          * 
          * @generated
          */
-        EAttribute TEXT_AREA_DESCRIPTION__LINE_COUNT = eINSTANCE.getTextAreaDescription_LineCount();
+        EAttribute TEXT_AREA_DESCRIPTION__LINE_COUNT = PropertiesPackage.eINSTANCE.getTextAreaDescription_LineCount();
 
     }
 
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioDescription.java
new file mode 100644
index 0000000000..7ccbfb3fd2
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/RadioDescription.java
@@ -0,0 +1,160 @@
+/**
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties;
+
+import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Radio Description</b></em>'. <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc --> Represents a radio button in the user interface.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.sirius.properties.RadioDescription#getValueExpression
+ * <em>Value Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.RadioDescription#getInitialOperation
+ * <em>Initial Operation</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.RadioDescription#getCandidatesExpression
+ * <em>Candidates Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.RadioDescription#getCandidateDisplayExpression
+ * <em>Candidate Display Expression</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getRadioDescription()
+ * @model
+ * @generated
+ */
+public interface RadioDescription extends WidgetDescription {
+    /**
+     * Returns the value of the '<em><b>Value Expression</b></em>' attribute.
+     * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
+     * The initial selected values of the radio. <!-- end-model-doc -->
+     *
+     * @return the value of the '<em>Value Expression</em>' attribute.
+     * @see #setValueExpression(String)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getRadioDescription_ValueExpression()
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @generated
+     */
+    String getValueExpression();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.RadioDescription#getValueExpression
+     * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Value Expression</em>' attribute.
+     * @see #getValueExpression()
+     * @generated
+     */
+    void setValueExpression(String value);
+
+    /**
+     * Returns the value of the '<em><b>Initial Operation</b></em>' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+     * begin-model-doc --> Defines the behavior executed when the end-user
+     * updates the value of the radio. <!-- end-model-doc -->
+     *
+     * @return the value of the '<em>Initial Operation</em>' containment
+     *         reference.
+     * @see #setInitialOperation(InitialOperation)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getRadioDescription_InitialOperation()
+     * @model containment="true" required="true"
+     * @generated
+     */
+    InitialOperation getInitialOperation();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.RadioDescription#getInitialOperation
+     * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Initial Operation</em>' containment
+     *            reference.
+     * @see #getInitialOperation()
+     * @generated
+     */
+    void setInitialOperation(InitialOperation value);
+
+    /**
+     * Returns the value of the '<em><b>Candidates Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+     * begin-model-doc --> Defines the various proposals available. <!--
+     * end-model-doc -->
+     *
+     * @return the value of the '<em>Candidates Expression</em>' attribute.
+     * @see #setCandidatesExpression(String)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getRadioDescription_CandidatesExpression()
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @generated
+     */
+    String getCandidatesExpression();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.RadioDescription#getCandidatesExpression
+     * <em>Candidates Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Candidates Expression</em>'
+     *            attribute.
+     * @see #getCandidatesExpression()
+     * @generated
+     */
+    void setCandidatesExpression(String value);
+
+    /**
+     * Returns the value of the '<em><b>Candidate Display Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+     * begin-model-doc --> Indicates how to display the input value. <!--
+     * end-model-doc -->
+     *
+     * @return the value of the '<em>Candidate Display Expression</em>'
+     *         attribute.
+     * @see #setCandidateDisplayExpression(String)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getRadioDescription_CandidateDisplayExpression()
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @generated
+     */
+    String getCandidateDisplayExpression();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.RadioDescription#getCandidateDisplayExpression
+     * <em>Candidate Display Expression</em>}' attribute. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Candidate Display Expression</em>'
+     *            attribute.
+     * @see #getCandidateDisplayExpression()
+     * @generated
+     */
+    void setCandidateDisplayExpression(String value);
+
+} // RadioDescription
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java
index 95fce84e91..5d773c8fc6 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/SelectDescription.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -47,7 +47,7 @@ public interface SelectDescription extends WidgetDescription {
      * Returns the value of the '<em><b>Value Expression</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
      * The initial selected values of the combo. <!-- end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Value Expression</em>' attribute.
      * @see #setValueExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectDescription_ValueExpression()
@@ -75,7 +75,7 @@ public interface SelectDescription extends WidgetDescription {
      * reference. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
      * begin-model-doc --> Defines the behavior executed when the end-user
      * updates the value of the combo. <!-- end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Initial Operation</em>' containment
      *         reference.
      * @see #setInitialOperation(InitialOperation)
@@ -104,7 +104,7 @@ public interface SelectDescription extends WidgetDescription {
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
      * begin-model-doc --> Defines the various proposals available. <!--
      * end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Candidates Expression</em>' attribute.
      * @see #setCandidatesExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectDescription_CandidatesExpression()
@@ -133,7 +133,7 @@ public interface SelectDescription extends WidgetDescription {
      * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
      * begin-model-doc --> Indicates how to display the input value. <!--
      * end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Candidate Display Expression</em>'
      *         attribute.
      * @see #setCandidateDisplayExpression(String)
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextAreaDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextAreaDescription.java
index e21fd8cc81..23e5be3a16 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextAreaDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextAreaDescription.java
@@ -4,10 +4,10 @@
  * 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;
 
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java
index 69e42aff59..a642d2d2f9 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/TextDescription.java
@@ -4,10 +4,10 @@
  * 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;
 
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java
index b64630cc4b..8fca773067 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ViewExtensionDescription.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -54,7 +54,7 @@ public interface ViewExtensionDescription extends Extension {
      * really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Identifier</em>' attribute.
      * @see #setIdentifier(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription_Identifier()
@@ -85,7 +85,7 @@ public interface ViewExtensionDescription extends Extension {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Metamodels</em>' reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription_Metamodels()
      * @model
@@ -103,7 +103,7 @@ public interface ViewExtensionDescription extends Extension {
      * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Pages</em>' containment reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription_Pages()
      * @model containment="true"
@@ -119,7 +119,7 @@ public interface ViewExtensionDescription extends Extension {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Default Page</em>' reference.
      * @see #setDefaultPage(PageDescription)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription_DefaultPage()
@@ -182,7 +182,7 @@ public interface ViewExtensionDescription extends Extension {
      * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Groups</em>' containment reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription_Groups()
      * @model containment="true"
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java
index bfeabc678d..2ccf44e135 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/WidgetDescription.java
@@ -4,10 +4,10 @@
  * 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;
 
@@ -41,7 +41,7 @@ public interface WidgetDescription extends EObject {
      * really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Identifier</em>' attribute.
      * @see #setIdentifier(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetDescription_Identifier()
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonDescriptionImpl.java
index 6f2099fe16..a5811fd565 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonDescriptionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -58,7 +58,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
      * @generated
      * @ordered
      */
-    protected String buttonLabelExpression = BUTTON_LABEL_EXPRESSION_EDEFAULT;
+    protected String buttonLabelExpression = ButtonDescriptionImpl.BUTTON_LABEL_EXPRESSION_EDEFAULT;
 
     /**
      * The cached value of the '{@link #getInitialOperation()
@@ -95,6 +95,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
      * 
      * @generated
      */
+    @Override
     public String getButtonLabelExpression() {
         return buttonLabelExpression;
     }
@@ -104,11 +105,13 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
      * 
      * @generated
      */
+    @Override
     public void setButtonLabelExpression(String newButtonLabelExpression) {
         String oldButtonLabelExpression = buttonLabelExpression;
         buttonLabelExpression = newButtonLabelExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION, oldButtonLabelExpression, buttonLabelExpression));
+        }
     }
 
     /**
@@ -116,6 +119,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
      * 
      * @generated
      */
+    @Override
     public InitialOperation getInitialOperation() {
         return initialOperation;
     }
@@ -130,10 +134,11 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
         initialOperation = newInitialOperation;
         if (eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION, oldInitialOperation, newInitialOperation);
-            if (msgs == null)
+            if (msgs == null) {
                 msgs = notification;
-            else
+            } else {
                 msgs.add(notification);
+            }
         }
         return msgs;
     }
@@ -143,18 +148,23 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
      * 
      * @generated
      */
+    @Override
     public void setInitialOperation(InitialOperation newInitialOperation) {
         if (newInitialOperation != initialOperation) {
             NotificationChain msgs = null;
-            if (initialOperation != null)
-                msgs = ((InternalEObject) initialOperation).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION, null, msgs);
-            if (newInitialOperation != null)
-                msgs = ((InternalEObject) newInitialOperation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION, null, msgs);
+            if (initialOperation != null) {
+                msgs = ((InternalEObject) initialOperation).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION, null, msgs);
+            }
+            if (newInitialOperation != null) {
+                msgs = ((InternalEObject) newInitialOperation).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION, null, msgs);
+            }
             msgs = basicSetInitialOperation(newInitialOperation, msgs);
-            if (msgs != null)
+            if (msgs != null) {
                 msgs.dispatch();
-        } else if (eNotificationRequired())
+            }
+        } else if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION, newInitialOperation, newInitialOperation));
+        }
     }
 
     /**
@@ -214,7 +224,7 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
     public void eUnset(int featureID) {
         switch (featureID) {
         case PropertiesPackage.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION:
-            setButtonLabelExpression(BUTTON_LABEL_EXPRESSION_EDEFAULT);
+            setButtonLabelExpression(ButtonDescriptionImpl.BUTTON_LABEL_EXPRESSION_EDEFAULT);
             return;
         case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
             setInitialOperation((InitialOperation) null);
@@ -232,7 +242,8 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case PropertiesPackage.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION:
-            return BUTTON_LABEL_EXPRESSION_EDEFAULT == null ? buttonLabelExpression != null : !BUTTON_LABEL_EXPRESSION_EDEFAULT.equals(buttonLabelExpression);
+            return ButtonDescriptionImpl.BUTTON_LABEL_EXPRESSION_EDEFAULT == null ? buttonLabelExpression != null : !ButtonDescriptionImpl.BUTTON_LABEL_EXPRESSION_EDEFAULT
+                    .equals(buttonLabelExpression);
         case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
             return initialOperation != null;
         }
@@ -246,8 +257,9 @@ public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements Butt
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (buttonLabelExpression: ");
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java
index 00b65816e5..4dab1603af 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/CheckboxDescriptionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -58,7 +58,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
      * @generated
      * @ordered
      */
-    protected String valueExpression = VALUE_EXPRESSION_EDEFAULT;
+    protected String valueExpression = CheckboxDescriptionImpl.VALUE_EXPRESSION_EDEFAULT;
 
     /**
      * The cached value of the '{@link #getInitialOperation()
@@ -95,6 +95,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
      * 
      * @generated
      */
+    @Override
     public String getValueExpression() {
         return valueExpression;
     }
@@ -104,11 +105,13 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
      * 
      * @generated
      */
+    @Override
     public void setValueExpression(String newValueExpression) {
         String oldValueExpression = valueExpression;
         valueExpression = newValueExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION, oldValueExpression, valueExpression));
+        }
     }
 
     /**
@@ -116,6 +119,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
      * 
      * @generated
      */
+    @Override
     public InitialOperation getInitialOperation() {
         return initialOperation;
     }
@@ -130,10 +134,11 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
         initialOperation = newInitialOperation;
         if (eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, oldInitialOperation, newInitialOperation);
-            if (msgs == null)
+            if (msgs == null) {
                 msgs = notification;
-            else
+            } else {
                 msgs.add(notification);
+            }
         }
         return msgs;
     }
@@ -143,18 +148,23 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
      * 
      * @generated
      */
+    @Override
     public void setInitialOperation(InitialOperation newInitialOperation) {
         if (newInitialOperation != initialOperation) {
             NotificationChain msgs = null;
-            if (initialOperation != null)
-                msgs = ((InternalEObject) initialOperation).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, null, msgs);
-            if (newInitialOperation != null)
-                msgs = ((InternalEObject) newInitialOperation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, null, msgs);
+            if (initialOperation != null) {
+                msgs = ((InternalEObject) initialOperation).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, null, msgs);
+            }
+            if (newInitialOperation != null) {
+                msgs = ((InternalEObject) newInitialOperation).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, null, msgs);
+            }
             msgs = basicSetInitialOperation(newInitialOperation, msgs);
-            if (msgs != null)
+            if (msgs != null) {
                 msgs.dispatch();
-        } else if (eNotificationRequired())
+            }
+        } else if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, newInitialOperation, newInitialOperation));
+        }
     }
 
     /**
@@ -214,7 +224,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
     public void eUnset(int featureID) {
         switch (featureID) {
         case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
-            setValueExpression(VALUE_EXPRESSION_EDEFAULT);
+            setValueExpression(CheckboxDescriptionImpl.VALUE_EXPRESSION_EDEFAULT);
             return;
         case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
             setInitialOperation((InitialOperation) null);
@@ -232,7 +242,7 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
-            return VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
+            return CheckboxDescriptionImpl.VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !CheckboxDescriptionImpl.VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
         case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
             return initialOperation != null;
         }
@@ -246,8 +256,9 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (valueExpression: ");
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java
index c637307860..5d4e925dee 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ContainerDescriptionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -66,7 +66,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
      * @generated
      * @ordered
      */
-    protected String identifier = IDENTIFIER_EDEFAULT;
+    protected String identifier = ContainerDescriptionImpl.IDENTIFIER_EDEFAULT;
 
     /**
      * The cached value of the '{@link #getWidgets() <em>Widgets</em>}'
@@ -82,7 +82,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
      * The cached value of the '{@link #getDynamicMappings()
      * <em>Dynamic Mappings</em>}' containment reference list. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #getDynamicMappings()
      * @generated
      * @ordered
@@ -113,6 +113,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
      * 
      * @generated
      */
+    @Override
     public String getIdentifier() {
         return identifier;
     }
@@ -122,11 +123,13 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
      * 
      * @generated
      */
+    @Override
     public void setIdentifier(String newIdentifier) {
         String oldIdentifier = identifier;
         identifier = newIdentifier;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER, oldIdentifier, identifier));
+        }
     }
 
     /**
@@ -134,6 +137,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
      * 
      * @generated
      */
+    @Override
     public EList<WidgetDescription> getWidgets() {
         if (widgets == null) {
             widgets = new EObjectContainmentEList<WidgetDescription>(WidgetDescription.class, this, PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS);
@@ -146,6 +150,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
      * 
      * @generated
      */
+    @Override
     public EList<DynamicMappingFor> getDynamicMappings() {
         if (dynamicMappings == null) {
             dynamicMappings = new EObjectContainmentEList<DynamicMappingFor>(DynamicMappingFor.class, this, PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS);
@@ -220,7 +225,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     public void eUnset(int featureID) {
         switch (featureID) {
         case PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER:
-            setIdentifier(IDENTIFIER_EDEFAULT);
+            setIdentifier(ContainerDescriptionImpl.IDENTIFIER_EDEFAULT);
             return;
         case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
             getWidgets().clear();
@@ -241,7 +246,7 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER:
-            return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
+            return ContainerDescriptionImpl.IDENTIFIER_EDEFAULT == null ? identifier != null : !ContainerDescriptionImpl.IDENTIFIER_EDEFAULT.equals(identifier);
         case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
             return widgets != null && !widgets.isEmpty();
         case PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS:
@@ -257,8 +262,9 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (identifier: ");
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingCaseImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingCaseImpl.java
index 81e0979407..1930fab4f3 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingCaseImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingCaseImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -59,7 +59,7 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
      * @generated
      * @ordered
      */
-    protected String caseExpression = CASE_EXPRESSION_EDEFAULT;
+    protected String caseExpression = DynamicMappingCaseImpl.CASE_EXPRESSION_EDEFAULT;
 
     /**
      * The cached value of the '{@link #getWidget() <em>Widget</em>}'
@@ -95,6 +95,7 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
      * 
      * @generated
      */
+    @Override
     public String getCaseExpression() {
         return caseExpression;
     }
@@ -104,11 +105,13 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
      * 
      * @generated
      */
+    @Override
     public void setCaseExpression(String newCaseExpression) {
         String oldCaseExpression = caseExpression;
         caseExpression = newCaseExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.DYNAMIC_MAPPING_CASE__CASE_EXPRESSION, oldCaseExpression, caseExpression));
+        }
     }
 
     /**
@@ -116,6 +119,7 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
      * 
      * @generated
      */
+    @Override
     public WidgetDescription getWidget() {
         return widget;
     }
@@ -130,10 +134,11 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
         widget = newWidget;
         if (eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET, oldWidget, newWidget);
-            if (msgs == null)
+            if (msgs == null) {
                 msgs = notification;
-            else
+            } else {
                 msgs.add(notification);
+            }
         }
         return msgs;
     }
@@ -143,18 +148,23 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
      * 
      * @generated
      */
+    @Override
     public void setWidget(WidgetDescription newWidget) {
         if (newWidget != widget) {
             NotificationChain msgs = null;
-            if (widget != null)
-                msgs = ((InternalEObject) widget).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET, null, msgs);
-            if (newWidget != null)
-                msgs = ((InternalEObject) newWidget).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET, null, msgs);
+            if (widget != null) {
+                msgs = ((InternalEObject) widget).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET, null, msgs);
+            }
+            if (newWidget != null) {
+                msgs = ((InternalEObject) newWidget).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET, null, msgs);
+            }
             msgs = basicSetWidget(newWidget, msgs);
-            if (msgs != null)
+            if (msgs != null) {
                 msgs.dispatch();
-        } else if (eNotificationRequired())
+            }
+        } else if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET, newWidget, newWidget));
+        }
     }
 
     /**
@@ -214,7 +224,7 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
     public void eUnset(int featureID) {
         switch (featureID) {
         case PropertiesPackage.DYNAMIC_MAPPING_CASE__CASE_EXPRESSION:
-            setCaseExpression(CASE_EXPRESSION_EDEFAULT);
+            setCaseExpression(DynamicMappingCaseImpl.CASE_EXPRESSION_EDEFAULT);
             return;
         case PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET:
             setWidget((WidgetDescription) null);
@@ -232,7 +242,7 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case PropertiesPackage.DYNAMIC_MAPPING_CASE__CASE_EXPRESSION:
-            return CASE_EXPRESSION_EDEFAULT == null ? caseExpression != null : !CASE_EXPRESSION_EDEFAULT.equals(caseExpression);
+            return DynamicMappingCaseImpl.CASE_EXPRESSION_EDEFAULT == null ? caseExpression != null : !DynamicMappingCaseImpl.CASE_EXPRESSION_EDEFAULT.equals(caseExpression);
         case PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET:
             return widget != null;
         }
@@ -246,8 +256,9 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (caseExpression: ");
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java
index 3976a637a1..fe72e60c0e 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingForImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -60,7 +60,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
      * @generated
      * @ordered
      */
-    protected String iterator = ITERATOR_EDEFAULT;
+    protected String iterator = DynamicMappingForImpl.ITERATOR_EDEFAULT;
 
     /**
      * The default value of the '{@link #getDomainClassExpression()
@@ -82,7 +82,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
      * @generated
      * @ordered
      */
-    protected String domainClassExpression = DOMAIN_CLASS_EXPRESSION_EDEFAULT;
+    protected String domainClassExpression = DynamicMappingForImpl.DOMAIN_CLASS_EXPRESSION_EDEFAULT;
 
     /**
      * The cached value of the '{@link #getSwitch() <em>Switch</em>}'
@@ -118,6 +118,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
      * 
      * @generated
      */
+    @Override
     public String getIterator() {
         return iterator;
     }
@@ -127,11 +128,13 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
      * 
      * @generated
      */
+    @Override
     public void setIterator(String newIterator) {
         String oldIterator = iterator;
         iterator = newIterator;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR, oldIterator, iterator));
+        }
     }
 
     /**
@@ -139,6 +142,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
      * 
      * @generated
      */
+    @Override
     public String getDomainClassExpression() {
         return domainClassExpression;
     }
@@ -148,11 +152,13 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
      * 
      * @generated
      */
+    @Override
     public void setDomainClassExpression(String newDomainClassExpression) {
         String oldDomainClassExpression = domainClassExpression;
         domainClassExpression = newDomainClassExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION, oldDomainClassExpression, domainClassExpression));
+        }
     }
 
     /**
@@ -160,6 +166,7 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
      * 
      * @generated
      */
+    @Override
     public DynamicMappingSwitch getSwitch() {
         return switch_;
     }
@@ -174,10 +181,11 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
         switch_ = newSwitch;
         if (eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH, oldSwitch, newSwitch);
-            if (msgs == null)
+            if (msgs == null) {
                 msgs = notification;
-            else
+            } else {
                 msgs.add(notification);
+            }
         }
         return msgs;
     }
@@ -187,18 +195,23 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
      * 
      * @generated
      */
+    @Override
     public void setSwitch(DynamicMappingSwitch newSwitch) {
         if (newSwitch != switch_) {
             NotificationChain msgs = null;
-            if (switch_ != null)
-                msgs = ((InternalEObject) switch_).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH, null, msgs);
-            if (newSwitch != null)
-                msgs = ((InternalEObject) newSwitch).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH, null, msgs);
+            if (switch_ != null) {
+                msgs = ((InternalEObject) switch_).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH, null, msgs);
+            }
+            if (newSwitch != null) {
+                msgs = ((InternalEObject) newSwitch).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH, null, msgs);
+            }
             msgs = basicSetSwitch(newSwitch, msgs);
-            if (msgs != null)
+            if (msgs != null) {
                 msgs.dispatch();
-        } else if (eNotificationRequired())
+            }
+        } else if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH, newSwitch, newSwitch));
+        }
     }
 
     /**
@@ -263,10 +276,10 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     public void eUnset(int featureID) {
         switch (featureID) {
         case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR:
-            setIterator(ITERATOR_EDEFAULT);
+            setIterator(DynamicMappingForImpl.ITERATOR_EDEFAULT);
             return;
         case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION:
-            setDomainClassExpression(DOMAIN_CLASS_EXPRESSION_EDEFAULT);
+            setDomainClassExpression(DynamicMappingForImpl.DOMAIN_CLASS_EXPRESSION_EDEFAULT);
             return;
         case PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH:
             setSwitch((DynamicMappingSwitch) null);
@@ -284,9 +297,10 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR:
-            return ITERATOR_EDEFAULT == null ? iterator != null : !ITERATOR_EDEFAULT.equals(iterator);
+            return DynamicMappingForImpl.ITERATOR_EDEFAULT == null ? iterator != null : !DynamicMappingForImpl.ITERATOR_EDEFAULT.equals(iterator);
         case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION:
-            return DOMAIN_CLASS_EXPRESSION_EDEFAULT == null ? domainClassExpression != null : !DOMAIN_CLASS_EXPRESSION_EDEFAULT.equals(domainClassExpression);
+            return DynamicMappingForImpl.DOMAIN_CLASS_EXPRESSION_EDEFAULT == null ? domainClassExpression != null : !DynamicMappingForImpl.DOMAIN_CLASS_EXPRESSION_EDEFAULT
+                    .equals(domainClassExpression);
         case PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH:
             return switch_ != null;
         }
@@ -300,8 +314,9 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (iterator: ");
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingSwitchImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingSwitchImpl.java
index 6288eeefbb..331f1f0a22 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingSwitchImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/DynamicMappingSwitchImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -64,7 +64,7 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
      * @generated
      * @ordered
      */
-    protected String switchExpression = SWITCH_EXPRESSION_EDEFAULT;
+    protected String switchExpression = DynamicMappingSwitchImpl.SWITCH_EXPRESSION_EDEFAULT;
 
     /**
      * The cached value of the '{@link #getCases() <em>Cases</em>}' containment
@@ -100,6 +100,7 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
      * 
      * @generated
      */
+    @Override
     public String getSwitchExpression() {
         return switchExpression;
     }
@@ -109,11 +110,13 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
      * 
      * @generated
      */
+    @Override
     public void setSwitchExpression(String newSwitchExpression) {
         String oldSwitchExpression = switchExpression;
         switchExpression = newSwitchExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION, oldSwitchExpression, switchExpression));
+        }
     }
 
     /**
@@ -121,6 +124,7 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
      * 
      * @generated
      */
+    @Override
     public EList<DynamicMappingCase> getCases() {
         if (cases == null) {
             cases = new EObjectContainmentEList<DynamicMappingCase>(DynamicMappingCase.class, this, PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES);
@@ -187,7 +191,7 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
     public void eUnset(int featureID) {
         switch (featureID) {
         case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION:
-            setSwitchExpression(SWITCH_EXPRESSION_EDEFAULT);
+            setSwitchExpression(DynamicMappingSwitchImpl.SWITCH_EXPRESSION_EDEFAULT);
             return;
         case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES:
             getCases().clear();
@@ -205,7 +209,7 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION:
-            return SWITCH_EXPRESSION_EDEFAULT == null ? switchExpression != null : !SWITCH_EXPRESSION_EDEFAULT.equals(switchExpression);
+            return DynamicMappingSwitchImpl.SWITCH_EXPRESSION_EDEFAULT == null ? switchExpression != null : !DynamicMappingSwitchImpl.SWITCH_EXPRESSION_EDEFAULT.equals(switchExpression);
         case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES:
             return cases != null && !cases.isEmpty();
         }
@@ -219,8 +223,9 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (switchExpression: ");
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java
index 615240b65a..473c1715f2 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/GroupDescriptionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -66,7 +66,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * @generated
      * @ordered
      */
-    protected String identifier = IDENTIFIER_EDEFAULT;
+    protected String identifier = GroupDescriptionImpl.IDENTIFIER_EDEFAULT;
 
     /**
      * The default value of the '{@link #getLabelExpression()
@@ -88,7 +88,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * @generated
      * @ordered
      */
-    protected String labelExpression = LABEL_EXPRESSION_EDEFAULT;
+    protected String labelExpression = GroupDescriptionImpl.LABEL_EXPRESSION_EDEFAULT;
 
     /**
      * The default value of the '{@link #getDomainClass() <em>Domain Class</em>}
@@ -108,7 +108,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * @generated
      * @ordered
      */
-    protected String domainClass = DOMAIN_CLASS_EDEFAULT;
+    protected String domainClass = GroupDescriptionImpl.DOMAIN_CLASS_EDEFAULT;
 
     /**
      * The default value of the '{@link #getSemanticCandidateExpression()
@@ -130,7 +130,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * @generated
      * @ordered
      */
-    protected String semanticCandidateExpression = SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT;
+    protected String semanticCandidateExpression = GroupDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT;
 
     /**
      * The cached value of the '{@link #getContainer() <em>Container</em>}'
@@ -166,6 +166,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * 
      * @generated
      */
+    @Override
     public String getIdentifier() {
         return identifier;
     }
@@ -175,11 +176,13 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * 
      * @generated
      */
+    @Override
     public void setIdentifier(String newIdentifier) {
         String oldIdentifier = identifier;
         identifier = newIdentifier;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER, oldIdentifier, identifier));
+        }
     }
 
     /**
@@ -187,6 +190,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * 
      * @generated
      */
+    @Override
     public String getLabelExpression() {
         return labelExpression;
     }
@@ -196,11 +200,13 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * 
      * @generated
      */
+    @Override
     public void setLabelExpression(String newLabelExpression) {
         String oldLabelExpression = labelExpression;
         labelExpression = newLabelExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION, oldLabelExpression, labelExpression));
+        }
     }
 
     /**
@@ -208,6 +214,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * 
      * @generated
      */
+    @Override
     public String getDomainClass() {
         return domainClass;
     }
@@ -217,11 +224,13 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * 
      * @generated
      */
+    @Override
     public void setDomainClass(String newDomainClass) {
         String oldDomainClass = domainClass;
         domainClass = newDomainClass;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS, oldDomainClass, domainClass));
+        }
     }
 
     /**
@@ -229,6 +238,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * 
      * @generated
      */
+    @Override
     public String getSemanticCandidateExpression() {
         return semanticCandidateExpression;
     }
@@ -238,11 +248,13 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * 
      * @generated
      */
+    @Override
     public void setSemanticCandidateExpression(String newSemanticCandidateExpression) {
         String oldSemanticCandidateExpression = semanticCandidateExpression;
         semanticCandidateExpression = newSemanticCandidateExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION, oldSemanticCandidateExpression, semanticCandidateExpression));
+        }
     }
 
     /**
@@ -250,6 +262,7 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * 
      * @generated
      */
+    @Override
     public ContainerDescription getContainer() {
         return container;
     }
@@ -264,10 +277,11 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
         container = newContainer;
         if (eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.GROUP_DESCRIPTION__CONTAINER, oldContainer, newContainer);
-            if (msgs == null)
+            if (msgs == null) {
                 msgs = notification;
-            else
+            } else {
                 msgs.add(notification);
+            }
         }
         return msgs;
     }
@@ -277,18 +291,23 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      * 
      * @generated
      */
+    @Override
     public void setContainer(ContainerDescription newContainer) {
         if (newContainer != container) {
             NotificationChain msgs = null;
-            if (container != null)
-                msgs = ((InternalEObject) container).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.GROUP_DESCRIPTION__CONTAINER, null, msgs);
-            if (newContainer != null)
-                msgs = ((InternalEObject) newContainer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.GROUP_DESCRIPTION__CONTAINER, null, msgs);
+            if (container != null) {
+                msgs = ((InternalEObject) container).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.GROUP_DESCRIPTION__CONTAINER, null, msgs);
+            }
+            if (newContainer != null) {
+                msgs = ((InternalEObject) newContainer).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.GROUP_DESCRIPTION__CONTAINER, null, msgs);
+            }
             msgs = basicSetContainer(newContainer, msgs);
-            if (msgs != null)
+            if (msgs != null) {
                 msgs.dispatch();
-        } else if (eNotificationRequired())
+            }
+        } else if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.GROUP_DESCRIPTION__CONTAINER, newContainer, newContainer));
+        }
     }
 
     /**
@@ -363,16 +382,16 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     public void eUnset(int featureID) {
         switch (featureID) {
         case PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER:
-            setIdentifier(IDENTIFIER_EDEFAULT);
+            setIdentifier(GroupDescriptionImpl.IDENTIFIER_EDEFAULT);
             return;
         case PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION:
-            setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
+            setLabelExpression(GroupDescriptionImpl.LABEL_EXPRESSION_EDEFAULT);
             return;
         case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
-            setDomainClass(DOMAIN_CLASS_EDEFAULT);
+            setDomainClass(GroupDescriptionImpl.DOMAIN_CLASS_EDEFAULT);
             return;
         case PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-            setSemanticCandidateExpression(SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT);
+            setSemanticCandidateExpression(GroupDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT);
             return;
         case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
             setContainer((ContainerDescription) null);
@@ -390,13 +409,14 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER:
-            return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
+            return GroupDescriptionImpl.IDENTIFIER_EDEFAULT == null ? identifier != null : !GroupDescriptionImpl.IDENTIFIER_EDEFAULT.equals(identifier);
         case PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION:
-            return LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
+            return GroupDescriptionImpl.LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !GroupDescriptionImpl.LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
         case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
-            return DOMAIN_CLASS_EDEFAULT == null ? domainClass != null : !DOMAIN_CLASS_EDEFAULT.equals(domainClass);
+            return GroupDescriptionImpl.DOMAIN_CLASS_EDEFAULT == null ? domainClass != null : !GroupDescriptionImpl.DOMAIN_CLASS_EDEFAULT.equals(domainClass);
         case PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-            return SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT == null ? semanticCandidateExpression != null : !SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT.equals(semanticCandidateExpression);
+            return GroupDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT == null ? semanticCandidateExpression != null : !GroupDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT
+                    .equals(semanticCandidateExpression);
         case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
             return container != null;
         }
@@ -410,8 +430,9 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (identifier: ");
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelDescriptionImpl.java
index 6148eb54fc..a9a15dc360 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/LabelDescriptionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java
index 1cf44eb2b5..f6067bc684 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PageDescriptionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -67,7 +67,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * @generated
      * @ordered
      */
-    protected String identifier = IDENTIFIER_EDEFAULT;
+    protected String identifier = PageDescriptionImpl.IDENTIFIER_EDEFAULT;
 
     /**
      * The default value of the '{@link #getLabelExpression()
@@ -89,7 +89,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * @generated
      * @ordered
      */
-    protected String labelExpression = LABEL_EXPRESSION_EDEFAULT;
+    protected String labelExpression = PageDescriptionImpl.LABEL_EXPRESSION_EDEFAULT;
 
     /**
      * The default value of the '{@link #getDomainClass() <em>Domain Class</em>}
@@ -109,7 +109,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * @generated
      * @ordered
      */
-    protected String domainClass = DOMAIN_CLASS_EDEFAULT;
+    protected String domainClass = PageDescriptionImpl.DOMAIN_CLASS_EDEFAULT;
 
     /**
      * The default value of the '{@link #getSemanticCandidateExpression()
@@ -131,7 +131,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * @generated
      * @ordered
      */
-    protected String semanticCandidateExpression = SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT;
+    protected String semanticCandidateExpression = PageDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT;
 
     /**
      * The cached value of the '{@link #getGroups() <em>Groups</em>}' reference
@@ -167,6 +167,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * 
      * @generated
      */
+    @Override
     public String getIdentifier() {
         return identifier;
     }
@@ -176,11 +177,13 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * 
      * @generated
      */
+    @Override
     public void setIdentifier(String newIdentifier) {
         String oldIdentifier = identifier;
         identifier = newIdentifier;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER, oldIdentifier, identifier));
+        }
     }
 
     /**
@@ -188,6 +191,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * 
      * @generated
      */
+    @Override
     public String getLabelExpression() {
         return labelExpression;
     }
@@ -197,11 +201,13 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * 
      * @generated
      */
+    @Override
     public void setLabelExpression(String newLabelExpression) {
         String oldLabelExpression = labelExpression;
         labelExpression = newLabelExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION, oldLabelExpression, labelExpression));
+        }
     }
 
     /**
@@ -209,6 +215,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * 
      * @generated
      */
+    @Override
     public String getDomainClass() {
         return domainClass;
     }
@@ -218,11 +225,13 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * 
      * @generated
      */
+    @Override
     public void setDomainClass(String newDomainClass) {
         String oldDomainClass = domainClass;
         domainClass = newDomainClass;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS, oldDomainClass, domainClass));
+        }
     }
 
     /**
@@ -230,6 +239,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * 
      * @generated
      */
+    @Override
     public String getSemanticCandidateExpression() {
         return semanticCandidateExpression;
     }
@@ -239,11 +249,13 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * 
      * @generated
      */
+    @Override
     public void setSemanticCandidateExpression(String newSemanticCandidateExpression) {
         String oldSemanticCandidateExpression = semanticCandidateExpression;
         semanticCandidateExpression = newSemanticCandidateExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION, oldSemanticCandidateExpression, semanticCandidateExpression));
+        }
     }
 
     /**
@@ -251,6 +263,7 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      * 
      * @generated
      */
+    @Override
     public EList<GroupDescription> getGroups() {
         if (groups == null) {
             groups = new EObjectResolvingEList<GroupDescription>(GroupDescription.class, this, PropertiesPackage.PAGE_DESCRIPTION__GROUPS);
@@ -318,16 +331,16 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     public void eUnset(int featureID) {
         switch (featureID) {
         case PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER:
-            setIdentifier(IDENTIFIER_EDEFAULT);
+            setIdentifier(PageDescriptionImpl.IDENTIFIER_EDEFAULT);
             return;
         case PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION:
-            setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
+            setLabelExpression(PageDescriptionImpl.LABEL_EXPRESSION_EDEFAULT);
             return;
         case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
-            setDomainClass(DOMAIN_CLASS_EDEFAULT);
+            setDomainClass(PageDescriptionImpl.DOMAIN_CLASS_EDEFAULT);
             return;
         case PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-            setSemanticCandidateExpression(SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT);
+            setSemanticCandidateExpression(PageDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT);
             return;
         case PropertiesPackage.PAGE_DESCRIPTION__GROUPS:
             getGroups().clear();
@@ -345,13 +358,14 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER:
-            return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
+            return PageDescriptionImpl.IDENTIFIER_EDEFAULT == null ? identifier != null : !PageDescriptionImpl.IDENTIFIER_EDEFAULT.equals(identifier);
         case PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION:
-            return LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
+            return PageDescriptionImpl.LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !PageDescriptionImpl.LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
         case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
-            return DOMAIN_CLASS_EDEFAULT == null ? domainClass != null : !DOMAIN_CLASS_EDEFAULT.equals(domainClass);
+            return PageDescriptionImpl.DOMAIN_CLASS_EDEFAULT == null ? domainClass != null : !PageDescriptionImpl.DOMAIN_CLASS_EDEFAULT.equals(domainClass);
         case PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-            return SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT == null ? semanticCandidateExpression != null : !SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT.equals(semanticCandidateExpression);
+            return PageDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT == null ? semanticCandidateExpression != null : !PageDescriptionImpl.SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT
+                    .equals(semanticCandidateExpression);
         case PropertiesPackage.PAGE_DESCRIPTION__GROUPS:
             return groups != null && !groups.isEmpty();
         }
@@ -365,8 +379,9 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (identifier: ");
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
index 49d4cfa867..93833e1ad2 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesFactoryImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -27,6 +27,7 @@ import org.eclipse.sirius.properties.LabelDescription;
 import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.RadioDescription;
 import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
@@ -101,6 +102,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
             return createDynamicMappingCase();
         case PropertiesPackage.TEXT_AREA_DESCRIPTION:
             return createTextAreaDescription();
+        case PropertiesPackage.RADIO_DESCRIPTION:
+            return createRadioDescription();
         default:
             throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
         }
@@ -111,6 +114,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * 
      * @generated
      */
+    @Override
     public ViewExtensionDescription createViewExtensionDescription() {
         ViewExtensionDescriptionImpl viewExtensionDescription = new ViewExtensionDescriptionImpl();
         return viewExtensionDescription;
@@ -121,6 +125,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * 
      * @generated
      */
+    @Override
     public PageDescription createPageDescription() {
         PageDescriptionImpl pageDescription = new PageDescriptionImpl();
         return pageDescription;
@@ -131,6 +136,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * 
      * @generated
      */
+    @Override
     public GroupDescription createGroupDescription() {
         GroupDescriptionImpl groupDescription = new GroupDescriptionImpl();
         return groupDescription;
@@ -141,6 +147,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * 
      * @generated
      */
+    @Override
     public ContainerDescription createContainerDescription() {
         ContainerDescriptionImpl containerDescription = new ContainerDescriptionImpl();
         return containerDescription;
@@ -151,6 +158,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * 
      * @generated
      */
+    @Override
     public TextDescription createTextDescription() {
         TextDescriptionImpl textDescription = new TextDescriptionImpl();
         return textDescription;
@@ -161,6 +169,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * 
      * @generated
      */
+    @Override
     public ButtonDescription createButtonDescription() {
         ButtonDescriptionImpl buttonDescription = new ButtonDescriptionImpl();
         return buttonDescription;
@@ -171,6 +180,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * 
      * @generated
      */
+    @Override
     public LabelDescription createLabelDescription() {
         LabelDescriptionImpl labelDescription = new LabelDescriptionImpl();
         return labelDescription;
@@ -181,6 +191,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * 
      * @generated
      */
+    @Override
     public CheckboxDescription createCheckboxDescription() {
         CheckboxDescriptionImpl checkboxDescription = new CheckboxDescriptionImpl();
         return checkboxDescription;
@@ -191,6 +202,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * 
      * @generated
      */
+    @Override
     public SelectDescription createSelectDescription() {
         SelectDescriptionImpl selectDescription = new SelectDescriptionImpl();
         return selectDescription;
@@ -201,6 +213,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * 
      * @generated
      */
+    @Override
     public DynamicMappingFor createDynamicMappingFor() {
         DynamicMappingForImpl dynamicMappingFor = new DynamicMappingForImpl();
         return dynamicMappingFor;
@@ -211,6 +224,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * 
      * @generated
      */
+    @Override
     public DynamicMappingSwitch createDynamicMappingSwitch() {
         DynamicMappingSwitchImpl dynamicMappingSwitch = new DynamicMappingSwitchImpl();
         return dynamicMappingSwitch;
@@ -221,6 +235,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * 
      * @generated
      */
+    @Override
     public DynamicMappingCase createDynamicMappingCase() {
         DynamicMappingCaseImpl dynamicMappingCase = new DynamicMappingCaseImpl();
         return dynamicMappingCase;
@@ -231,6 +246,18 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * 
      * @generated
      */
+    @Override
+    public RadioDescription createRadioDescription() {
+        RadioDescriptionImpl radioDescription = new RadioDescriptionImpl();
+        return radioDescription;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
     public TextAreaDescription createTextAreaDescription() {
         TextAreaDescriptionImpl textAreaDescription = new TextAreaDescriptionImpl();
         return textAreaDescription;
@@ -241,6 +268,7 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
      * 
      * @generated
      */
+    @Override
     public PropertiesPackage getPropertiesPackage() {
         return (PropertiesPackage) getEPackage();
     }
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
index 8eb37c0903..41b7fb07be 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -28,6 +28,7 @@ import org.eclipse.sirius.properties.LabelDescription;
 import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.RadioDescription;
 import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
@@ -143,6 +144,13 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     private EClass textAreaDescriptionEClass = null;
 
     /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    private EClass radioDescriptionEClass = null;
+
+    /**
      * Creates an instance of the model <b>Package</b>, registered with
      * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
      * package package URI value.
@@ -151,14 +159,14 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * method {@link #init init()}, which also performs initialization of the
      * package, or returns the registered package, if one already exists. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see org.eclipse.emf.ecore.EPackage.Registry
      * @see org.eclipse.sirius.properties.PropertiesPackage#eNS_URI
      * @see #init()
      * @generated
      */
     private PropertiesPackageImpl() {
-        super(eNS_URI, PropertiesFactory.eINSTANCE);
+        super(PropertiesPackage.eNS_URI, PropertiesFactory.eINSTANCE);
     }
 
     /**
@@ -171,27 +179,28 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     /**
      * Creates, registers, and initializes the <b>Package</b> for this model,
      * and for any others upon which it depends.
-     * 
+     *
      * <p>
      * This method is used to initialize {@link PropertiesPackage#eINSTANCE}
      * when that field is accessed. Clients should not invoke it directly.
      * Instead, they should simply access that field to obtain the package. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @see #eNS_URI
      * @see #createPackageContents()
      * @see #initializePackageContents()
      * @generated
      */
     public static PropertiesPackage init() {
-        if (isInited)
+        if (PropertiesPackageImpl.isInited) {
             return (PropertiesPackage) EPackage.Registry.INSTANCE.getEPackage(PropertiesPackage.eNS_URI);
+        }
 
         // Obtain or create and register package
-        PropertiesPackageImpl thePropertiesPackage = (PropertiesPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PropertiesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-                : new PropertiesPackageImpl());
+        PropertiesPackageImpl thePropertiesPackage = (PropertiesPackageImpl) (EPackage.Registry.INSTANCE.get(PropertiesPackage.eNS_URI) instanceof PropertiesPackageImpl ? EPackage.Registry.INSTANCE
+                .get(PropertiesPackage.eNS_URI) : new PropertiesPackageImpl());
 
-        isInited = true;
+        PropertiesPackageImpl.isInited = true;
 
         // Initialize simple dependencies
         ViewpointPackage.eINSTANCE.eClass();
@@ -215,6 +224,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EClass getViewExtensionDescription() {
         return viewExtensionDescriptionEClass;
     }
@@ -224,6 +234,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getViewExtensionDescription_Identifier() {
         return (EAttribute) viewExtensionDescriptionEClass.getEStructuralFeatures().get(0);
     }
@@ -233,6 +244,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getViewExtensionDescription_Metamodels() {
         return (EReference) viewExtensionDescriptionEClass.getEStructuralFeatures().get(1);
     }
@@ -242,6 +254,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getViewExtensionDescription_Pages() {
         return (EReference) viewExtensionDescriptionEClass.getEStructuralFeatures().get(2);
     }
@@ -251,6 +264,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getViewExtensionDescription_DefaultPage() {
         return (EReference) viewExtensionDescriptionEClass.getEStructuralFeatures().get(3);
     }
@@ -260,6 +274,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getViewExtensionDescription_LabelExpression() {
         return (EAttribute) viewExtensionDescriptionEClass.getEStructuralFeatures().get(4);
     }
@@ -269,6 +284,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getViewExtensionDescription_Groups() {
         return (EReference) viewExtensionDescriptionEClass.getEStructuralFeatures().get(5);
     }
@@ -278,6 +294,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EClass getPageDescription() {
         return pageDescriptionEClass;
     }
@@ -287,6 +304,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getPageDescription_Identifier() {
         return (EAttribute) pageDescriptionEClass.getEStructuralFeatures().get(0);
     }
@@ -296,6 +314,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getPageDescription_LabelExpression() {
         return (EAttribute) pageDescriptionEClass.getEStructuralFeatures().get(1);
     }
@@ -305,6 +324,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getPageDescription_DomainClass() {
         return (EAttribute) pageDescriptionEClass.getEStructuralFeatures().get(2);
     }
@@ -314,6 +334,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getPageDescription_SemanticCandidateExpression() {
         return (EAttribute) pageDescriptionEClass.getEStructuralFeatures().get(3);
     }
@@ -323,6 +344,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getPageDescription_Groups() {
         return (EReference) pageDescriptionEClass.getEStructuralFeatures().get(4);
     }
@@ -332,6 +354,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EClass getGroupDescription() {
         return groupDescriptionEClass;
     }
@@ -341,6 +364,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getGroupDescription_Identifier() {
         return (EAttribute) groupDescriptionEClass.getEStructuralFeatures().get(0);
     }
@@ -350,6 +374,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getGroupDescription_LabelExpression() {
         return (EAttribute) groupDescriptionEClass.getEStructuralFeatures().get(1);
     }
@@ -359,6 +384,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getGroupDescription_DomainClass() {
         return (EAttribute) groupDescriptionEClass.getEStructuralFeatures().get(2);
     }
@@ -368,6 +394,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getGroupDescription_SemanticCandidateExpression() {
         return (EAttribute) groupDescriptionEClass.getEStructuralFeatures().get(3);
     }
@@ -377,6 +404,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getGroupDescription_Container() {
         return (EReference) groupDescriptionEClass.getEStructuralFeatures().get(4);
     }
@@ -386,6 +414,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EClass getContainerDescription() {
         return containerDescriptionEClass;
     }
@@ -395,6 +424,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getContainerDescription_Identifier() {
         return (EAttribute) containerDescriptionEClass.getEStructuralFeatures().get(0);
     }
@@ -404,6 +434,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getContainerDescription_Widgets() {
         return (EReference) containerDescriptionEClass.getEStructuralFeatures().get(1);
     }
@@ -413,6 +444,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getContainerDescription_DynamicMappings() {
         return (EReference) containerDescriptionEClass.getEStructuralFeatures().get(2);
     }
@@ -422,6 +454,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EClass getWidgetDescription() {
         return widgetDescriptionEClass;
     }
@@ -431,6 +464,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getWidgetDescription_Identifier() {
         return (EAttribute) widgetDescriptionEClass.getEStructuralFeatures().get(0);
     }
@@ -440,6 +474,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getWidgetDescription_LabelExpression() {
         return (EAttribute) widgetDescriptionEClass.getEStructuralFeatures().get(1);
     }
@@ -449,6 +484,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EClass getTextDescription() {
         return textDescriptionEClass;
     }
@@ -458,6 +494,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getTextDescription_ValueExpression() {
         return (EAttribute) textDescriptionEClass.getEStructuralFeatures().get(0);
     }
@@ -467,6 +504,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getTextDescription_InitialOperation() {
         return (EReference) textDescriptionEClass.getEStructuralFeatures().get(1);
     }
@@ -476,6 +514,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EClass getButtonDescription() {
         return buttonDescriptionEClass;
     }
@@ -485,6 +524,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getButtonDescription_ButtonLabelExpression() {
         return (EAttribute) buttonDescriptionEClass.getEStructuralFeatures().get(0);
     }
@@ -494,6 +534,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getButtonDescription_InitialOperation() {
         return (EReference) buttonDescriptionEClass.getEStructuralFeatures().get(1);
     }
@@ -503,6 +544,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EClass getLabelDescription() {
         return labelDescriptionEClass;
     }
@@ -512,6 +554,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EClass getCheckboxDescription() {
         return checkboxDescriptionEClass;
     }
@@ -521,6 +564,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getCheckboxDescription_ValueExpression() {
         return (EAttribute) checkboxDescriptionEClass.getEStructuralFeatures().get(0);
     }
@@ -530,6 +574,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getCheckboxDescription_InitialOperation() {
         return (EReference) checkboxDescriptionEClass.getEStructuralFeatures().get(1);
     }
@@ -539,6 +584,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EClass getSelectDescription() {
         return selectDescriptionEClass;
     }
@@ -548,6 +594,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getSelectDescription_ValueExpression() {
         return (EAttribute) selectDescriptionEClass.getEStructuralFeatures().get(0);
     }
@@ -557,6 +604,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getSelectDescription_InitialOperation() {
         return (EReference) selectDescriptionEClass.getEStructuralFeatures().get(1);
     }
@@ -566,6 +614,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getSelectDescription_CandidatesExpression() {
         return (EAttribute) selectDescriptionEClass.getEStructuralFeatures().get(2);
     }
@@ -575,6 +624,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getSelectDescription_CandidateDisplayExpression() {
         return (EAttribute) selectDescriptionEClass.getEStructuralFeatures().get(3);
     }
@@ -584,6 +634,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EClass getDynamicMappingFor() {
         return dynamicMappingForEClass;
     }
@@ -593,6 +644,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getDynamicMappingFor_Iterator() {
         return (EAttribute) dynamicMappingForEClass.getEStructuralFeatures().get(0);
     }
@@ -602,6 +654,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getDynamicMappingFor_DomainClassExpression() {
         return (EAttribute) dynamicMappingForEClass.getEStructuralFeatures().get(1);
     }
@@ -611,6 +664,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getDynamicMappingFor_Switch() {
         return (EReference) dynamicMappingForEClass.getEStructuralFeatures().get(2);
     }
@@ -620,6 +674,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EClass getDynamicMappingSwitch() {
         return dynamicMappingSwitchEClass;
     }
@@ -629,6 +684,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getDynamicMappingSwitch_SwitchExpression() {
         return (EAttribute) dynamicMappingSwitchEClass.getEStructuralFeatures().get(0);
     }
@@ -638,6 +694,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getDynamicMappingSwitch_Cases() {
         return (EReference) dynamicMappingSwitchEClass.getEStructuralFeatures().get(1);
     }
@@ -647,6 +704,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EClass getDynamicMappingCase() {
         return dynamicMappingCaseEClass;
     }
@@ -656,6 +714,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getDynamicMappingCase_CaseExpression() {
         return (EAttribute) dynamicMappingCaseEClass.getEStructuralFeatures().get(0);
     }
@@ -665,6 +724,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EReference getDynamicMappingCase_Widget() {
         return (EReference) dynamicMappingCaseEClass.getEStructuralFeatures().get(1);
     }
@@ -674,6 +734,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EClass getTextAreaDescription() {
         return textAreaDescriptionEClass;
     }
@@ -683,6 +744,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
     public EAttribute getTextAreaDescription_LineCount() {
         return (EAttribute) textAreaDescriptionEClass.getEStructuralFeatures().get(0);
     }
@@ -692,6 +754,57 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * 
      * @generated
      */
+    @Override
+    public EClass getRadioDescription() {
+        return radioDescriptionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EAttribute getRadioDescription_ValueExpression() {
+        return (EAttribute) radioDescriptionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EReference getRadioDescription_InitialOperation() {
+        return (EReference) radioDescriptionEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EAttribute getRadioDescription_CandidatesExpression() {
+        return (EAttribute) radioDescriptionEClass.getEStructuralFeatures().get(2);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public EAttribute getRadioDescription_CandidateDisplayExpression() {
+        return (EAttribute) radioDescriptionEClass.getEStructuralFeatures().get(3);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
     public PropertiesFactory getPropertiesFactory() {
         return (PropertiesFactory) getEFactoryInstance();
     }
@@ -711,77 +824,84 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * @generated
      */
     public void createPackageContents() {
-        if (isCreated)
+        if (isCreated) {
             return;
+        }
         isCreated = true;
 
         // Create classes and their features
-        viewExtensionDescriptionEClass = createEClass(VIEW_EXTENSION_DESCRIPTION);
-        createEAttribute(viewExtensionDescriptionEClass, VIEW_EXTENSION_DESCRIPTION__IDENTIFIER);
-        createEReference(viewExtensionDescriptionEClass, VIEW_EXTENSION_DESCRIPTION__METAMODELS);
-        createEReference(viewExtensionDescriptionEClass, VIEW_EXTENSION_DESCRIPTION__PAGES);
-        createEReference(viewExtensionDescriptionEClass, VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE);
-        createEAttribute(viewExtensionDescriptionEClass, VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION);
-        createEReference(viewExtensionDescriptionEClass, VIEW_EXTENSION_DESCRIPTION__GROUPS);
-
-        pageDescriptionEClass = createEClass(PAGE_DESCRIPTION);
-        createEAttribute(pageDescriptionEClass, PAGE_DESCRIPTION__IDENTIFIER);
-        createEAttribute(pageDescriptionEClass, PAGE_DESCRIPTION__LABEL_EXPRESSION);
-        createEAttribute(pageDescriptionEClass, PAGE_DESCRIPTION__DOMAIN_CLASS);
-        createEAttribute(pageDescriptionEClass, PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION);
-        createEReference(pageDescriptionEClass, PAGE_DESCRIPTION__GROUPS);
-
-        groupDescriptionEClass = createEClass(GROUP_DESCRIPTION);
-        createEAttribute(groupDescriptionEClass, GROUP_DESCRIPTION__IDENTIFIER);
-        createEAttribute(groupDescriptionEClass, GROUP_DESCRIPTION__LABEL_EXPRESSION);
-        createEAttribute(groupDescriptionEClass, GROUP_DESCRIPTION__DOMAIN_CLASS);
-        createEAttribute(groupDescriptionEClass, GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION);
-        createEReference(groupDescriptionEClass, GROUP_DESCRIPTION__CONTAINER);
-
-        containerDescriptionEClass = createEClass(CONTAINER_DESCRIPTION);
-        createEAttribute(containerDescriptionEClass, CONTAINER_DESCRIPTION__IDENTIFIER);
-        createEReference(containerDescriptionEClass, CONTAINER_DESCRIPTION__WIDGETS);
-        createEReference(containerDescriptionEClass, CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS);
-
-        widgetDescriptionEClass = createEClass(WIDGET_DESCRIPTION);
-        createEAttribute(widgetDescriptionEClass, WIDGET_DESCRIPTION__IDENTIFIER);
-        createEAttribute(widgetDescriptionEClass, WIDGET_DESCRIPTION__LABEL_EXPRESSION);
-
-        textDescriptionEClass = createEClass(TEXT_DESCRIPTION);
-        createEAttribute(textDescriptionEClass, TEXT_DESCRIPTION__VALUE_EXPRESSION);
-        createEReference(textDescriptionEClass, TEXT_DESCRIPTION__INITIAL_OPERATION);
-
-        buttonDescriptionEClass = createEClass(BUTTON_DESCRIPTION);
-        createEAttribute(buttonDescriptionEClass, BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION);
-        createEReference(buttonDescriptionEClass, BUTTON_DESCRIPTION__INITIAL_OPERATION);
-
-        labelDescriptionEClass = createEClass(LABEL_DESCRIPTION);
-
-        checkboxDescriptionEClass = createEClass(CHECKBOX_DESCRIPTION);
-        createEAttribute(checkboxDescriptionEClass, CHECKBOX_DESCRIPTION__VALUE_EXPRESSION);
-        createEReference(checkboxDescriptionEClass, CHECKBOX_DESCRIPTION__INITIAL_OPERATION);
-
-        selectDescriptionEClass = createEClass(SELECT_DESCRIPTION);
-        createEAttribute(selectDescriptionEClass, SELECT_DESCRIPTION__VALUE_EXPRESSION);
-        createEReference(selectDescriptionEClass, SELECT_DESCRIPTION__INITIAL_OPERATION);
-        createEAttribute(selectDescriptionEClass, SELECT_DESCRIPTION__CANDIDATES_EXPRESSION);
-        createEAttribute(selectDescriptionEClass, SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION);
-
-        dynamicMappingForEClass = createEClass(DYNAMIC_MAPPING_FOR);
-        createEAttribute(dynamicMappingForEClass, DYNAMIC_MAPPING_FOR__ITERATOR);
-        createEAttribute(dynamicMappingForEClass, DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION);
-        createEReference(dynamicMappingForEClass, DYNAMIC_MAPPING_FOR__SWITCH);
-
-        dynamicMappingSwitchEClass = createEClass(DYNAMIC_MAPPING_SWITCH);
-        createEAttribute(dynamicMappingSwitchEClass, DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION);
-        createEReference(dynamicMappingSwitchEClass, DYNAMIC_MAPPING_SWITCH__CASES);
-
-        dynamicMappingCaseEClass = createEClass(DYNAMIC_MAPPING_CASE);
-        createEAttribute(dynamicMappingCaseEClass, DYNAMIC_MAPPING_CASE__CASE_EXPRESSION);
-        createEReference(dynamicMappingCaseEClass, DYNAMIC_MAPPING_CASE__WIDGET);
-
-        textAreaDescriptionEClass = createEClass(TEXT_AREA_DESCRIPTION);
-        createEAttribute(textAreaDescriptionEClass, TEXT_AREA_DESCRIPTION__LINE_COUNT);
+        viewExtensionDescriptionEClass = createEClass(PropertiesPackage.VIEW_EXTENSION_DESCRIPTION);
+        createEAttribute(viewExtensionDescriptionEClass, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER);
+        createEReference(viewExtensionDescriptionEClass, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__METAMODELS);
+        createEReference(viewExtensionDescriptionEClass, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES);
+        createEReference(viewExtensionDescriptionEClass, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE);
+        createEAttribute(viewExtensionDescriptionEClass, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION);
+        createEReference(viewExtensionDescriptionEClass, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS);
+
+        pageDescriptionEClass = createEClass(PropertiesPackage.PAGE_DESCRIPTION);
+        createEAttribute(pageDescriptionEClass, PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER);
+        createEAttribute(pageDescriptionEClass, PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION);
+        createEAttribute(pageDescriptionEClass, PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS);
+        createEAttribute(pageDescriptionEClass, PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION);
+        createEReference(pageDescriptionEClass, PropertiesPackage.PAGE_DESCRIPTION__GROUPS);
+
+        groupDescriptionEClass = createEClass(PropertiesPackage.GROUP_DESCRIPTION);
+        createEAttribute(groupDescriptionEClass, PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER);
+        createEAttribute(groupDescriptionEClass, PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION);
+        createEAttribute(groupDescriptionEClass, PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS);
+        createEAttribute(groupDescriptionEClass, PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION);
+        createEReference(groupDescriptionEClass, PropertiesPackage.GROUP_DESCRIPTION__CONTAINER);
+
+        containerDescriptionEClass = createEClass(PropertiesPackage.CONTAINER_DESCRIPTION);
+        createEAttribute(containerDescriptionEClass, PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER);
+        createEReference(containerDescriptionEClass, PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS);
+        createEReference(containerDescriptionEClass, PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS);
+
+        widgetDescriptionEClass = createEClass(PropertiesPackage.WIDGET_DESCRIPTION);
+        createEAttribute(widgetDescriptionEClass, PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER);
+        createEAttribute(widgetDescriptionEClass, PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION);
+
+        textDescriptionEClass = createEClass(PropertiesPackage.TEXT_DESCRIPTION);
+        createEAttribute(textDescriptionEClass, PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION);
+        createEReference(textDescriptionEClass, PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION);
+
+        buttonDescriptionEClass = createEClass(PropertiesPackage.BUTTON_DESCRIPTION);
+        createEAttribute(buttonDescriptionEClass, PropertiesPackage.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION);
+        createEReference(buttonDescriptionEClass, PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION);
+
+        labelDescriptionEClass = createEClass(PropertiesPackage.LABEL_DESCRIPTION);
+
+        checkboxDescriptionEClass = createEClass(PropertiesPackage.CHECKBOX_DESCRIPTION);
+        createEAttribute(checkboxDescriptionEClass, PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION);
+        createEReference(checkboxDescriptionEClass, PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION);
+
+        selectDescriptionEClass = createEClass(PropertiesPackage.SELECT_DESCRIPTION);
+        createEAttribute(selectDescriptionEClass, PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION);
+        createEReference(selectDescriptionEClass, PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION);
+        createEAttribute(selectDescriptionEClass, PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION);
+        createEAttribute(selectDescriptionEClass, PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION);
+
+        dynamicMappingForEClass = createEClass(PropertiesPackage.DYNAMIC_MAPPING_FOR);
+        createEAttribute(dynamicMappingForEClass, PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR);
+        createEAttribute(dynamicMappingForEClass, PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION);
+        createEReference(dynamicMappingForEClass, PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH);
+
+        dynamicMappingSwitchEClass = createEClass(PropertiesPackage.DYNAMIC_MAPPING_SWITCH);
+        createEAttribute(dynamicMappingSwitchEClass, PropertiesPackage.DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION);
+        createEReference(dynamicMappingSwitchEClass, PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES);
+
+        dynamicMappingCaseEClass = createEClass(PropertiesPackage.DYNAMIC_MAPPING_CASE);
+        createEAttribute(dynamicMappingCaseEClass, PropertiesPackage.DYNAMIC_MAPPING_CASE__CASE_EXPRESSION);
+        createEReference(dynamicMappingCaseEClass, PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET);
+
+        textAreaDescriptionEClass = createEClass(PropertiesPackage.TEXT_AREA_DESCRIPTION);
+        createEAttribute(textAreaDescriptionEClass, PropertiesPackage.TEXT_AREA_DESCRIPTION__LINE_COUNT);
+
+        radioDescriptionEClass = createEClass(PropertiesPackage.RADIO_DESCRIPTION);
+        createEAttribute(radioDescriptionEClass, PropertiesPackage.RADIO_DESCRIPTION__VALUE_EXPRESSION);
+        createEReference(radioDescriptionEClass, PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION);
+        createEAttribute(radioDescriptionEClass, PropertiesPackage.RADIO_DESCRIPTION__CANDIDATES_EXPRESSION);
+        createEAttribute(radioDescriptionEClass, PropertiesPackage.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION);
     }
 
     /**
@@ -795,18 +915,19 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
      * Complete the initialization of the package and its meta-model. This
      * method is guarded to have no affect on any invocation but its first. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     public void initializePackageContents() {
-        if (isInitialized)
+        if (isInitialized) {
             return;
+        }
         isInitialized = true;
 
         // Initialize package
-        setName(eNAME);
-        setNsPrefix(eNS_PREFIX);
-        setNsURI(eNS_URI);
+        setName(PropertiesPackage.eNAME);
+        setNsPrefix(PropertiesPackage.eNS_PREFIX);
+        setNsURI(PropertiesPackage.eNS_URI);
 
         // Obtain other dependent packages
         DescriptionPackage theDescriptionPackage = (DescriptionPackage) EPackage.Registry.INSTANCE.getEPackage(DescriptionPackage.eNS_URI);
@@ -825,116 +946,153 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         checkboxDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
         selectDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
         textAreaDescriptionEClass.getESuperTypes().add(this.getTextDescription());
+        radioDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
 
         // Initialize classes and features; add operations and parameters
-        initEClass(viewExtensionDescriptionEClass, ViewExtensionDescription.class, "ViewExtensionDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getViewExtensionDescription_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, ViewExtensionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getViewExtensionDescription_Metamodels(), theEcorePackage.getEPackage(), null, "metamodels", null, 0, -1, ViewExtensionDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getViewExtensionDescription_Pages(), this.getPageDescription(), null, "pages", null, 0, -1, ViewExtensionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getViewExtensionDescription_DefaultPage(), this.getPageDescription(), null, "defaultPage", null, 0, 1, ViewExtensionDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getViewExtensionDescription_LabelExpression(), theDescriptionPackage.getInterpretedExpression(), "labelExpression", null, 0, 1, ViewExtensionDescription.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getViewExtensionDescription_Groups(), this.getGroupDescription(), null, "groups", null, 0, -1, ViewExtensionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(pageDescriptionEClass, PageDescription.class, "PageDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getPageDescription_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, PageDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPageDescription_LabelExpression(), theDescriptionPackage.getInterpretedExpression(), "labelExpression", null, 0, 1, PageDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getPageDescription_DomainClass(), theDescriptionPackage.getTypeName(), "domainClass", null, 0, 1, PageDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEClass(viewExtensionDescriptionEClass, ViewExtensionDescription.class, "ViewExtensionDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE,
+                EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getViewExtensionDescription_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, ViewExtensionDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getViewExtensionDescription_Metamodels(), theEcorePackage.getEPackage(), null, "metamodels", null, 0, -1, ViewExtensionDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getViewExtensionDescription_Pages(), this.getPageDescription(), null, "pages", null, 0, -1, ViewExtensionDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getViewExtensionDescription_DefaultPage(), this.getPageDescription(), null, "defaultPage", null, 0, 1, ViewExtensionDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getViewExtensionDescription_LabelExpression(), theDescriptionPackage.getInterpretedExpression(), "labelExpression", null, 0, 1, ViewExtensionDescription.class,
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+        initEReference(getViewExtensionDescription_Groups(), this.getGroupDescription(), null, "groups", null, 0, -1, ViewExtensionDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+
+        initEClass(pageDescriptionEClass, PageDescription.class, "PageDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getPageDescription_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, PageDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getPageDescription_LabelExpression(), theDescriptionPackage.getInterpretedExpression(), "labelExpression", null, 0, 1, PageDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getPageDescription_DomainClass(), theDescriptionPackage.getTypeName(), "domainClass", null, 0, 1, PageDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEAttribute(getPageDescription_SemanticCandidateExpression(), theDescriptionPackage.getInterpretedExpression(), "semanticCandidateExpression", null, 0, 1, PageDescription.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getPageDescription_Groups(), this.getGroupDescription(), null, "groups", null, 0, -1, PageDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(groupDescriptionEClass, GroupDescription.class, "GroupDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getGroupDescription_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, GroupDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-                !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getGroupDescription_LabelExpression(), theDescriptionPackage.getInterpretedExpression(), "labelExpression", null, 0, 1, GroupDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getGroupDescription_DomainClass(), theDescriptionPackage.getTypeName(), "domainClass", null, 0, 1, GroupDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+        initEReference(getPageDescription_Groups(), this.getGroupDescription(), null, "groups", null, 0, -1, PageDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+
+        initEClass(groupDescriptionEClass, GroupDescription.class, "GroupDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getGroupDescription_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, GroupDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getGroupDescription_LabelExpression(), theDescriptionPackage.getInterpretedExpression(), "labelExpression", null, 0, 1, GroupDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getGroupDescription_DomainClass(), theDescriptionPackage.getTypeName(), "domainClass", null, 0, 1, GroupDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
         initEAttribute(getGroupDescription_SemanticCandidateExpression(), theDescriptionPackage.getInterpretedExpression(), "semanticCandidateExpression", null, 0, 1, GroupDescription.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getGroupDescription_Container(), this.getContainerDescription(), null, "container", null, 0, 1, GroupDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(containerDescriptionEClass, ContainerDescription.class, "ContainerDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getContainerDescription_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, ContainerDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getContainerDescription_Widgets(), this.getWidgetDescription(), null, "widgets", null, 0, -1, ContainerDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getContainerDescription_DynamicMappings(), this.getDynamicMappingFor(), null, "dynamicMappings", null, 0, -1, ContainerDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(widgetDescriptionEClass, WidgetDescription.class, "WidgetDescription", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getWidgetDescription_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, WidgetDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-                !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWidgetDescription_LabelExpression(), theDescriptionPackage.getInterpretedExpression(), "labelExpression", null, 0, 1, WidgetDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(textDescriptionEClass, TextDescription.class, "TextDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTextDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, TextDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getTextDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, TextDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(buttonDescriptionEClass, ButtonDescription.class, "ButtonDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getButtonDescription_ButtonLabelExpression(), theDescriptionPackage.getInterpretedExpression(), "buttonLabelExpression", null, 0, 1, ButtonDescription.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getButtonDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, ButtonDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(labelDescriptionEClass, LabelDescription.class, "LabelDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(checkboxDescriptionEClass, CheckboxDescription.class, "CheckboxDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCheckboxDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, CheckboxDescription.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getCheckboxDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, CheckboxDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(selectDescriptionEClass, SelectDescription.class, "SelectDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getSelectDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, SelectDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getSelectDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, SelectDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getSelectDescription_CandidatesExpression(), theDescriptionPackage.getInterpretedExpression(), "candidatesExpression", null, 0, 1, SelectDescription.class, !IS_TRANSIENT,
-                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+        initEReference(getGroupDescription_Container(), this.getContainerDescription(), null, "container", null, 0, 1, GroupDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+
+        initEClass(containerDescriptionEClass, ContainerDescription.class, "ContainerDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getContainerDescription_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, ContainerDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getContainerDescription_Widgets(), this.getWidgetDescription(), null, "widgets", null, 0, -1, ContainerDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+        initEReference(getContainerDescription_DynamicMappings(), this.getDynamicMappingFor(), null, "dynamicMappings", null, 0, -1, ContainerDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+
+        initEClass(widgetDescriptionEClass, WidgetDescription.class, "WidgetDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getWidgetDescription_Identifier(), ecorePackage.getEString(), "identifier", null, 1, 1, WidgetDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getWidgetDescription_LabelExpression(), theDescriptionPackage.getInterpretedExpression(), "labelExpression", null, 0, 1, WidgetDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+
+        initEClass(textDescriptionEClass, TextDescription.class, "TextDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getTextDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, TextDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getTextDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, TextDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+
+        initEClass(buttonDescriptionEClass, ButtonDescription.class, "ButtonDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getButtonDescription_ButtonLabelExpression(), theDescriptionPackage.getInterpretedExpression(), "buttonLabelExpression", null, 0, 1, ButtonDescription.class,
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+        initEReference(getButtonDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, ButtonDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+
+        initEClass(labelDescriptionEClass, LabelDescription.class, "LabelDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+
+        initEClass(checkboxDescriptionEClass, CheckboxDescription.class, "CheckboxDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getCheckboxDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, CheckboxDescription.class,
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+        initEReference(getCheckboxDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, CheckboxDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+
+        initEClass(selectDescriptionEClass, SelectDescription.class, "SelectDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getSelectDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, SelectDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getSelectDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, SelectDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getSelectDescription_CandidatesExpression(), theDescriptionPackage.getInterpretedExpression(), "candidatesExpression", null, 0, 1, SelectDescription.class,
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
         initEAttribute(getSelectDescription_CandidateDisplayExpression(), theDescriptionPackage.getInterpretedExpression(), "candidateDisplayExpression", null, 0, 1, SelectDescription.class,
-                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(dynamicMappingForEClass, DynamicMappingFor.class, "DynamicMappingFor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDynamicMappingFor_Iterator(), theEcorePackage.getEString(), "iterator", null, 1, 1, DynamicMappingFor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-                !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getDynamicMappingFor_DomainClassExpression(), theEcorePackage.getEString(), "domainClassExpression", null, 1, 1, DynamicMappingFor.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDynamicMappingFor_Switch(), this.getDynamicMappingSwitch(), null, "switch", null, 1, 1, DynamicMappingFor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(dynamicMappingSwitchEClass, DynamicMappingSwitch.class, "DynamicMappingSwitch", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDynamicMappingSwitch_SwitchExpression(), theEcorePackage.getEString(), "switchExpression", null, 1, 1, DynamicMappingSwitch.class, !IS_TRANSIENT, !IS_VOLATILE,
-                IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDynamicMappingSwitch_Cases(), this.getDynamicMappingCase(), null, "cases", null, 1, -1, DynamicMappingSwitch.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(dynamicMappingCaseEClass, DynamicMappingCase.class, "DynamicMappingCase", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDynamicMappingCase_CaseExpression(), theEcorePackage.getEString(), "caseExpression", null, 1, 1, DynamicMappingCase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDynamicMappingCase_Widget(), this.getWidgetDescription(), null, "widget", null, 1, 1, DynamicMappingCase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(textAreaDescriptionEClass, TextAreaDescription.class, "TextAreaDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTextAreaDescription_LineCount(), ecorePackage.getEInt(), "lineCount", "5", 0, 1, TextAreaDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-                !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+
+        initEClass(dynamicMappingForEClass, DynamicMappingFor.class, "DynamicMappingFor", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getDynamicMappingFor_Iterator(), theEcorePackage.getEString(), "iterator", null, 1, 1, DynamicMappingFor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getDynamicMappingFor_DomainClassExpression(), theEcorePackage.getEString(), "domainClassExpression", null, 1, 1, DynamicMappingFor.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDynamicMappingFor_Switch(), this.getDynamicMappingSwitch(), null, "switch", null, 1, 1, DynamicMappingFor.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+
+        initEClass(dynamicMappingSwitchEClass, DynamicMappingSwitch.class, "DynamicMappingSwitch", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getDynamicMappingSwitch_SwitchExpression(), theEcorePackage.getEString(), "switchExpression", null, 1, 1, DynamicMappingSwitch.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDynamicMappingSwitch_Cases(), this.getDynamicMappingCase(), null, "cases", null, 1, -1, DynamicMappingSwitch.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+
+        initEClass(dynamicMappingCaseEClass, DynamicMappingCase.class, "DynamicMappingCase", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getDynamicMappingCase_CaseExpression(), theEcorePackage.getEString(), "caseExpression", null, 1, 1, DynamicMappingCase.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getDynamicMappingCase_Widget(), this.getWidgetDescription(), null, "widget", null, 1, 1, DynamicMappingCase.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+
+        initEClass(textAreaDescriptionEClass, TextAreaDescription.class, "TextAreaDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getTextAreaDescription_LineCount(), ecorePackage.getEInt(), "lineCount", "5", 0, 1, TextAreaDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
+                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+
+        initEClass(radioDescriptionEClass, RadioDescription.class, "RadioDescription", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getRadioDescription_ValueExpression(), theDescriptionPackage.getInterpretedExpression(), "valueExpression", null, 0, 1, RadioDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEReference(getRadioDescription_InitialOperation(), theToolPackage.getInitialOperation(), null, "initialOperation", null, 1, 1, RadioDescription.class, !EPackageImpl.IS_TRANSIENT,
+                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
+                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        initEAttribute(getRadioDescription_CandidatesExpression(), theDescriptionPackage.getInterpretedExpression(), "candidatesExpression", null, 0, 1, RadioDescription.class,
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
+        initEAttribute(getRadioDescription_CandidateDisplayExpression(), theDescriptionPackage.getInterpretedExpression(), "candidateDisplayExpression", null, 0, 1, RadioDescription.class,
+                !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
+                EPackageImpl.IS_ORDERED);
 
         // Create resource
-        createResource(eNS_URI);
+        createResource(PropertiesPackage.eNS_URI);
     }
 
 } // PropertiesPackageImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioDescriptionImpl.java
new file mode 100644
index 0000000000..c5d82a2700
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/RadioDescriptionImpl.java
@@ -0,0 +1,393 @@
+/**
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *
+ */
+package org.eclipse.sirius.properties.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.RadioDescription;
+import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Radio Description</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.RadioDescriptionImpl#getValueExpression
+ * <em>Value Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.RadioDescriptionImpl#getInitialOperation
+ * <em>Initial Operation</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.RadioDescriptionImpl#getCandidatesExpression
+ * <em>Candidates Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.RadioDescriptionImpl#getCandidateDisplayExpression
+ * <em>Candidate Display Expression</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class RadioDescriptionImpl extends WidgetDescriptionImpl implements RadioDescription {
+    /**
+     * The default value of the '{@link #getValueExpression()
+     * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see #getValueExpression()
+     * @generated
+     * @ordered
+     */
+    protected static final String VALUE_EXPRESSION_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getValueExpression()
+     * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see #getValueExpression()
+     * @generated
+     * @ordered
+     */
+    protected String valueExpression = RadioDescriptionImpl.VALUE_EXPRESSION_EDEFAULT;
+
+    /**
+     * The cached value of the '{@link #getInitialOperation()
+     * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @see #getInitialOperation()
+     * @generated
+     * @ordered
+     */
+    protected InitialOperation initialOperation;
+
+    /**
+     * The default value of the '{@link #getCandidatesExpression()
+     * <em>Candidates Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see #getCandidatesExpression()
+     * @generated
+     * @ordered
+     */
+    protected static final String CANDIDATES_EXPRESSION_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getCandidatesExpression()
+     * <em>Candidates Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see #getCandidatesExpression()
+     * @generated
+     * @ordered
+     */
+    protected String candidatesExpression = RadioDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getCandidateDisplayExpression()
+     * <em>Candidate Display Expression</em>}' attribute. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @see #getCandidateDisplayExpression()
+     * @generated
+     * @ordered
+     */
+    protected static final String CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getCandidateDisplayExpression()
+     * <em>Candidate Display Expression</em>}' attribute. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @see #getCandidateDisplayExpression()
+     * @generated
+     * @ordered
+     */
+    protected String candidateDisplayExpression = RadioDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    protected RadioDescriptionImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.RADIO_DESCRIPTION;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String getValueExpression() {
+        return valueExpression;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void setValueExpression(String newValueExpression) {
+        String oldValueExpression = valueExpression;
+        valueExpression = newValueExpression;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.RADIO_DESCRIPTION__VALUE_EXPRESSION, oldValueExpression, valueExpression));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public InitialOperation getInitialOperation() {
+        return initialOperation;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public NotificationChain basicSetInitialOperation(InitialOperation newInitialOperation, NotificationChain msgs) {
+        InitialOperation oldInitialOperation = initialOperation;
+        initialOperation = newInitialOperation;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION, oldInitialOperation, newInitialOperation);
+            if (msgs == null) {
+                msgs = notification;
+            } else {
+                msgs.add(notification);
+            }
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void setInitialOperation(InitialOperation newInitialOperation) {
+        if (newInitialOperation != initialOperation) {
+            NotificationChain msgs = null;
+            if (initialOperation != null) {
+                msgs = ((InternalEObject) initialOperation).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION, null, msgs);
+            }
+            if (newInitialOperation != null) {
+                msgs = ((InternalEObject) newInitialOperation).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION, null, msgs);
+            }
+            msgs = basicSetInitialOperation(newInitialOperation, msgs);
+            if (msgs != null) {
+                msgs.dispatch();
+            }
+        } else if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION, newInitialOperation, newInitialOperation));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String getCandidatesExpression() {
+        return candidatesExpression;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void setCandidatesExpression(String newCandidatesExpression) {
+        String oldCandidatesExpression = candidatesExpression;
+        candidatesExpression = newCandidatesExpression;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.RADIO_DESCRIPTION__CANDIDATES_EXPRESSION, oldCandidatesExpression, candidatesExpression));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String getCandidateDisplayExpression() {
+        return candidateDisplayExpression;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void setCandidateDisplayExpression(String newCandidateDisplayExpression) {
+        String oldCandidateDisplayExpression = candidateDisplayExpression;
+        candidateDisplayExpression = newCandidateDisplayExpression;
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION, oldCandidateDisplayExpression, candidateDisplayExpression));
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+        case PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION:
+            return basicSetInitialOperation(null, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case PropertiesPackage.RADIO_DESCRIPTION__VALUE_EXPRESSION:
+            return getValueExpression();
+        case PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION:
+            return getInitialOperation();
+        case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATES_EXPRESSION:
+            return getCandidatesExpression();
+        case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
+            return getCandidateDisplayExpression();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case PropertiesPackage.RADIO_DESCRIPTION__VALUE_EXPRESSION:
+            setValueExpression((String) newValue);
+            return;
+        case PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION:
+            setInitialOperation((InitialOperation) newValue);
+            return;
+        case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATES_EXPRESSION:
+            setCandidatesExpression((String) newValue);
+            return;
+        case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
+            setCandidateDisplayExpression((String) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.RADIO_DESCRIPTION__VALUE_EXPRESSION:
+            setValueExpression(RadioDescriptionImpl.VALUE_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION:
+            setInitialOperation((InitialOperation) null);
+            return;
+        case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATES_EXPRESSION:
+            setCandidatesExpression(RadioDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
+            setCandidateDisplayExpression(RadioDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT);
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.RADIO_DESCRIPTION__VALUE_EXPRESSION:
+            return RadioDescriptionImpl.VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !RadioDescriptionImpl.VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
+        case PropertiesPackage.RADIO_DESCRIPTION__INITIAL_OPERATION:
+            return initialOperation != null;
+        case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATES_EXPRESSION:
+            return RadioDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT == null ? candidatesExpression != null : !RadioDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT.equals(candidatesExpression);
+        case PropertiesPackage.RADIO_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
+            return RadioDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT == null ? candidateDisplayExpression != null : !RadioDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT
+                    .equals(candidateDisplayExpression);
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String toString() {
+        if (eIsProxy()) {
+            return super.toString();
+        }
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (valueExpression: ");
+        result.append(valueExpression);
+        result.append(", candidatesExpression: ");
+        result.append(candidatesExpression);
+        result.append(", candidateDisplayExpression: ");
+        result.append(candidateDisplayExpression);
+        result.append(')');
+        return result.toString();
+    }
+
+} // RadioDescriptionImpl
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java
index a6f2fec685..bad3bc7f89 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/SelectDescriptionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -64,7 +64,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * @generated
      * @ordered
      */
-    protected String valueExpression = VALUE_EXPRESSION_EDEFAULT;
+    protected String valueExpression = SelectDescriptionImpl.VALUE_EXPRESSION_EDEFAULT;
 
     /**
      * The cached value of the '{@link #getInitialOperation()
@@ -97,7 +97,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * @generated
      * @ordered
      */
-    protected String candidatesExpression = CANDIDATES_EXPRESSION_EDEFAULT;
+    protected String candidatesExpression = SelectDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT;
 
     /**
      * The default value of the '{@link #getCandidateDisplayExpression()
@@ -119,7 +119,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * @generated
      * @ordered
      */
-    protected String candidateDisplayExpression = CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT;
+    protected String candidateDisplayExpression = SelectDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -145,6 +145,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * 
      * @generated
      */
+    @Override
     public String getValueExpression() {
         return valueExpression;
     }
@@ -154,11 +155,13 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * 
      * @generated
      */
+    @Override
     public void setValueExpression(String newValueExpression) {
         String oldValueExpression = valueExpression;
         valueExpression = newValueExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION, oldValueExpression, valueExpression));
+        }
     }
 
     /**
@@ -166,6 +169,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * 
      * @generated
      */
+    @Override
     public InitialOperation getInitialOperation() {
         return initialOperation;
     }
@@ -180,10 +184,11 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
         initialOperation = newInitialOperation;
         if (eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION, oldInitialOperation, newInitialOperation);
-            if (msgs == null)
+            if (msgs == null) {
                 msgs = notification;
-            else
+            } else {
                 msgs.add(notification);
+            }
         }
         return msgs;
     }
@@ -193,18 +198,23 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * 
      * @generated
      */
+    @Override
     public void setInitialOperation(InitialOperation newInitialOperation) {
         if (newInitialOperation != initialOperation) {
             NotificationChain msgs = null;
-            if (initialOperation != null)
-                msgs = ((InternalEObject) initialOperation).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION, null, msgs);
-            if (newInitialOperation != null)
-                msgs = ((InternalEObject) newInitialOperation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION, null, msgs);
+            if (initialOperation != null) {
+                msgs = ((InternalEObject) initialOperation).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION, null, msgs);
+            }
+            if (newInitialOperation != null) {
+                msgs = ((InternalEObject) newInitialOperation).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION, null, msgs);
+            }
             msgs = basicSetInitialOperation(newInitialOperation, msgs);
-            if (msgs != null)
+            if (msgs != null) {
                 msgs.dispatch();
-        } else if (eNotificationRequired())
+            }
+        } else if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION, newInitialOperation, newInitialOperation));
+        }
     }
 
     /**
@@ -212,6 +222,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * 
      * @generated
      */
+    @Override
     public String getCandidatesExpression() {
         return candidatesExpression;
     }
@@ -221,11 +232,13 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * 
      * @generated
      */
+    @Override
     public void setCandidatesExpression(String newCandidatesExpression) {
         String oldCandidatesExpression = candidatesExpression;
         candidatesExpression = newCandidatesExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION, oldCandidatesExpression, candidatesExpression));
+        }
     }
 
     /**
@@ -233,6 +246,7 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * 
      * @generated
      */
+    @Override
     public String getCandidateDisplayExpression() {
         return candidateDisplayExpression;
     }
@@ -242,11 +256,13 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      * 
      * @generated
      */
+    @Override
     public void setCandidateDisplayExpression(String newCandidateDisplayExpression) {
         String oldCandidateDisplayExpression = candidateDisplayExpression;
         candidateDisplayExpression = newCandidateDisplayExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION, oldCandidateDisplayExpression, candidateDisplayExpression));
+        }
     }
 
     /**
@@ -316,16 +332,16 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     public void eUnset(int featureID) {
         switch (featureID) {
         case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
-            setValueExpression(VALUE_EXPRESSION_EDEFAULT);
+            setValueExpression(SelectDescriptionImpl.VALUE_EXPRESSION_EDEFAULT);
             return;
         case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
             setInitialOperation((InitialOperation) null);
             return;
         case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
-            setCandidatesExpression(CANDIDATES_EXPRESSION_EDEFAULT);
+            setCandidatesExpression(SelectDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT);
             return;
         case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
-            setCandidateDisplayExpression(CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT);
+            setCandidateDisplayExpression(SelectDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT);
             return;
         }
         super.eUnset(featureID);
@@ -340,13 +356,14 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
-            return VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
+            return SelectDescriptionImpl.VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !SelectDescriptionImpl.VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
         case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
             return initialOperation != null;
         case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
-            return CANDIDATES_EXPRESSION_EDEFAULT == null ? candidatesExpression != null : !CANDIDATES_EXPRESSION_EDEFAULT.equals(candidatesExpression);
+            return SelectDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT == null ? candidatesExpression != null : !SelectDescriptionImpl.CANDIDATES_EXPRESSION_EDEFAULT.equals(candidatesExpression);
         case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
-            return CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT == null ? candidateDisplayExpression != null : !CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT.equals(candidateDisplayExpression);
+            return SelectDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT == null ? candidateDisplayExpression != null : !SelectDescriptionImpl.CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT
+                    .equals(candidateDisplayExpression);
         }
         return super.eIsSet(featureID);
     }
@@ -358,8 +375,9 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (valueExpression: ");
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextAreaDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextAreaDescriptionImpl.java
index 2a4c2434b4..773a5b1c61 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextAreaDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextAreaDescriptionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -50,7 +50,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
      * @generated
      * @ordered
      */
-    protected int lineCount = LINE_COUNT_EDEFAULT;
+    protected int lineCount = TextAreaDescriptionImpl.LINE_COUNT_EDEFAULT;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -76,6 +76,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
      * 
      * @generated
      */
+    @Override
     public int getLineCount() {
         return lineCount;
     }
@@ -85,11 +86,13 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
      * 
      * @generated
      */
+    @Override
     public void setLineCount(int newLineCount) {
         int oldLineCount = lineCount;
         lineCount = newLineCount;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_AREA_DESCRIPTION__LINE_COUNT, oldLineCount, lineCount));
+        }
     }
 
     /**
@@ -130,7 +133,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
     public void eUnset(int featureID) {
         switch (featureID) {
         case PropertiesPackage.TEXT_AREA_DESCRIPTION__LINE_COUNT:
-            setLineCount(LINE_COUNT_EDEFAULT);
+            setLineCount(TextAreaDescriptionImpl.LINE_COUNT_EDEFAULT);
             return;
         }
         super.eUnset(featureID);
@@ -145,7 +148,7 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case PropertiesPackage.TEXT_AREA_DESCRIPTION__LINE_COUNT:
-            return lineCount != LINE_COUNT_EDEFAULT;
+            return lineCount != TextAreaDescriptionImpl.LINE_COUNT_EDEFAULT;
         }
         return super.eIsSet(featureID);
     }
@@ -157,8 +160,9 @@ public class TextAreaDescriptionImpl extends TextDescriptionImpl implements Text
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (lineCount: ");
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java
index 804e276131..e98631d5ce 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/TextDescriptionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -58,7 +58,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      * @generated
      * @ordered
      */
-    protected String valueExpression = VALUE_EXPRESSION_EDEFAULT;
+    protected String valueExpression = TextDescriptionImpl.VALUE_EXPRESSION_EDEFAULT;
 
     /**
      * The cached value of the '{@link #getInitialOperation()
@@ -95,6 +95,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      * 
      * @generated
      */
+    @Override
     public String getValueExpression() {
         return valueExpression;
     }
@@ -104,11 +105,13 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      * 
      * @generated
      */
+    @Override
     public void setValueExpression(String newValueExpression) {
         String oldValueExpression = valueExpression;
         valueExpression = newValueExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION, oldValueExpression, valueExpression));
+        }
     }
 
     /**
@@ -116,6 +119,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      * 
      * @generated
      */
+    @Override
     public InitialOperation getInitialOperation() {
         return initialOperation;
     }
@@ -130,10 +134,11 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
         initialOperation = newInitialOperation;
         if (eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION, oldInitialOperation, newInitialOperation);
-            if (msgs == null)
+            if (msgs == null) {
                 msgs = notification;
-            else
+            } else {
                 msgs.add(notification);
+            }
         }
         return msgs;
     }
@@ -143,18 +148,23 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      * 
      * @generated
      */
+    @Override
     public void setInitialOperation(InitialOperation newInitialOperation) {
         if (newInitialOperation != initialOperation) {
             NotificationChain msgs = null;
-            if (initialOperation != null)
-                msgs = ((InternalEObject) initialOperation).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION, null, msgs);
-            if (newInitialOperation != null)
-                msgs = ((InternalEObject) newInitialOperation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION, null, msgs);
+            if (initialOperation != null) {
+                msgs = ((InternalEObject) initialOperation).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION, null, msgs);
+            }
+            if (newInitialOperation != null) {
+                msgs = ((InternalEObject) newInitialOperation).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION, null, msgs);
+            }
             msgs = basicSetInitialOperation(newInitialOperation, msgs);
-            if (msgs != null)
+            if (msgs != null) {
                 msgs.dispatch();
-        } else if (eNotificationRequired())
+            }
+        } else if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION, newInitialOperation, newInitialOperation));
+        }
     }
 
     /**
@@ -214,7 +224,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     public void eUnset(int featureID) {
         switch (featureID) {
         case PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION:
-            setValueExpression(VALUE_EXPRESSION_EDEFAULT);
+            setValueExpression(TextDescriptionImpl.VALUE_EXPRESSION_EDEFAULT);
             return;
         case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
             setInitialOperation((InitialOperation) null);
@@ -232,7 +242,7 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION:
-            return VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
+            return TextDescriptionImpl.VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !TextDescriptionImpl.VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
         case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
             return initialOperation != null;
         }
@@ -246,8 +256,9 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (valueExpression: ");
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java
index 7e15c6af25..3d1d13f7ad 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ViewExtensionDescriptionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -77,7 +77,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
      * @generated
      * @ordered
      */
-    protected String identifier = IDENTIFIER_EDEFAULT;
+    protected String identifier = ViewExtensionDescriptionImpl.IDENTIFIER_EDEFAULT;
 
     /**
      * The cached value of the '{@link #getMetamodels() <em>Metamodels</em>}'
@@ -129,7 +129,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
      * @generated
      * @ordered
      */
-    protected String labelExpression = LABEL_EXPRESSION_EDEFAULT;
+    protected String labelExpression = ViewExtensionDescriptionImpl.LABEL_EXPRESSION_EDEFAULT;
 
     /**
      * The cached value of the '{@link #getGroups() <em>Groups</em>}'
@@ -165,6 +165,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
      * 
      * @generated
      */
+    @Override
     public String getIdentifier() {
         return identifier;
     }
@@ -174,11 +175,13 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
      * 
      * @generated
      */
+    @Override
     public void setIdentifier(String newIdentifier) {
         String oldIdentifier = identifier;
         identifier = newIdentifier;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER, oldIdentifier, identifier));
+        }
     }
 
     /**
@@ -186,6 +189,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
      * 
      * @generated
      */
+    @Override
     public EList<EPackage> getMetamodels() {
         if (metamodels == null) {
             metamodels = new EObjectResolvingEList<EPackage>(EPackage.class, this, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__METAMODELS);
@@ -198,6 +202,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
      * 
      * @generated
      */
+    @Override
     public EList<PageDescription> getPages() {
         if (pages == null) {
             pages = new EObjectContainmentEList<PageDescription>(PageDescription.class, this, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES);
@@ -210,13 +215,15 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
      * 
      * @generated
      */
+    @Override
     public PageDescription getDefaultPage() {
         if (defaultPage != null && defaultPage.eIsProxy()) {
             InternalEObject oldDefaultPage = (InternalEObject) defaultPage;
             defaultPage = (PageDescription) eResolveProxy(oldDefaultPage);
             if (defaultPage != oldDefaultPage) {
-                if (eNotificationRequired())
+                if (eNotificationRequired()) {
                     eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE, oldDefaultPage, defaultPage));
+                }
             }
         }
         return defaultPage;
@@ -236,11 +243,13 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
      * 
      * @generated
      */
+    @Override
     public void setDefaultPage(PageDescription newDefaultPage) {
         PageDescription oldDefaultPage = defaultPage;
         defaultPage = newDefaultPage;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE, oldDefaultPage, defaultPage));
+        }
     }
 
     /**
@@ -248,6 +257,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
      * 
      * @generated
      */
+    @Override
     public String getLabelExpression() {
         return labelExpression;
     }
@@ -257,11 +267,13 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
      * 
      * @generated
      */
+    @Override
     public void setLabelExpression(String newLabelExpression) {
         String oldLabelExpression = labelExpression;
         labelExpression = newLabelExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION, oldLabelExpression, labelExpression));
+        }
     }
 
     /**
@@ -269,6 +281,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
      * 
      * @generated
      */
+    @Override
     public EList<GroupDescription> getGroups() {
         if (groups == null) {
             groups = new EObjectContainmentEList<GroupDescription>(GroupDescription.class, this, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS);
@@ -307,8 +320,9 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
         case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
             return getPages();
         case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE:
-            if (resolve)
+            if (resolve) {
                 return getDefaultPage();
+            }
             return basicGetDefaultPage();
         case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
             return getLabelExpression();
@@ -361,7 +375,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     public void eUnset(int featureID) {
         switch (featureID) {
         case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER:
-            setIdentifier(IDENTIFIER_EDEFAULT);
+            setIdentifier(ViewExtensionDescriptionImpl.IDENTIFIER_EDEFAULT);
             return;
         case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__METAMODELS:
             getMetamodels().clear();
@@ -373,7 +387,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
             setDefaultPage((PageDescription) null);
             return;
         case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
-            setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
+            setLabelExpression(ViewExtensionDescriptionImpl.LABEL_EXPRESSION_EDEFAULT);
             return;
         case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
             getGroups().clear();
@@ -391,7 +405,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER:
-            return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
+            return ViewExtensionDescriptionImpl.IDENTIFIER_EDEFAULT == null ? identifier != null : !ViewExtensionDescriptionImpl.IDENTIFIER_EDEFAULT.equals(identifier);
         case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__METAMODELS:
             return metamodels != null && !metamodels.isEmpty();
         case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
@@ -399,7 +413,7 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
         case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE:
             return defaultPage != null;
         case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
-            return LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
+            return ViewExtensionDescriptionImpl.LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !ViewExtensionDescriptionImpl.LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
         case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
             return groups != null && !groups.isEmpty();
         }
@@ -413,8 +427,9 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (identifier: ");
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java
index d983a47bdf..a59201435f 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/WidgetDescriptionImpl.java
@@ -4,10 +4,10 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Obeo - initial API and implementation
- * 
+ *
  */
 package org.eclipse.sirius.properties.impl;
 
@@ -54,7 +54,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
      * @generated
      * @ordered
      */
-    protected String identifier = IDENTIFIER_EDEFAULT;
+    protected String identifier = WidgetDescriptionImpl.IDENTIFIER_EDEFAULT;
 
     /**
      * The default value of the '{@link #getLabelExpression()
@@ -76,7 +76,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
      * @generated
      * @ordered
      */
-    protected String labelExpression = LABEL_EXPRESSION_EDEFAULT;
+    protected String labelExpression = WidgetDescriptionImpl.LABEL_EXPRESSION_EDEFAULT;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -102,6 +102,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
      * 
      * @generated
      */
+    @Override
     public String getIdentifier() {
         return identifier;
     }
@@ -111,11 +112,13 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
      * 
      * @generated
      */
+    @Override
     public void setIdentifier(String newIdentifier) {
         String oldIdentifier = identifier;
         identifier = newIdentifier;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER, oldIdentifier, identifier));
+        }
     }
 
     /**
@@ -123,6 +126,7 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
      * 
      * @generated
      */
+    @Override
     public String getLabelExpression() {
         return labelExpression;
     }
@@ -132,11 +136,13 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
      * 
      * @generated
      */
+    @Override
     public void setLabelExpression(String newLabelExpression) {
         String oldLabelExpression = labelExpression;
         labelExpression = newLabelExpression;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION, oldLabelExpression, labelExpression));
+        }
     }
 
     /**
@@ -182,10 +188,10 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     public void eUnset(int featureID) {
         switch (featureID) {
         case PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER:
-            setIdentifier(IDENTIFIER_EDEFAULT);
+            setIdentifier(WidgetDescriptionImpl.IDENTIFIER_EDEFAULT);
             return;
         case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
-            setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
+            setLabelExpression(WidgetDescriptionImpl.LABEL_EXPRESSION_EDEFAULT);
             return;
         }
         super.eUnset(featureID);
@@ -200,9 +206,9 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     public boolean eIsSet(int featureID) {
         switch (featureID) {
         case PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER:
-            return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
+            return WidgetDescriptionImpl.IDENTIFIER_EDEFAULT == null ? identifier != null : !WidgetDescriptionImpl.IDENTIFIER_EDEFAULT.equals(identifier);
         case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
-            return LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
+            return WidgetDescriptionImpl.LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !WidgetDescriptionImpl.LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
         }
         return super.eIsSet(featureID);
     }
@@ -214,8 +220,9 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
      */
     @Override
     public String toString() {
-        if (eIsProxy())
+        if (eIsProxy()) {
             return super.toString();
+        }
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (identifier: ");
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
index a2a5efb4b0..7224607d3b 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesAdapterFactory.java
@@ -4,10 +4,10 @@
  * 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.util;
 
@@ -25,6 +25,7 @@ import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.LabelDescription;
 import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.RadioDescription;
 import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
@@ -55,8 +56,8 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * @generated
      */
     public PropertiesAdapterFactory() {
-        if (modelPackage == null) {
-            modelPackage = PropertiesPackage.eINSTANCE;
+        if (PropertiesAdapterFactory.modelPackage == null) {
+            PropertiesAdapterFactory.modelPackage = PropertiesPackage.eINSTANCE;
         }
     }
 
@@ -71,11 +72,11 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      */
     @Override
     public boolean isFactoryForType(Object object) {
-        if (object == modelPackage) {
+        if (object == PropertiesAdapterFactory.modelPackage) {
             return true;
         }
         if (object instanceof EObject) {
-            return ((EObject) object).eClass().getEPackage() == modelPackage;
+            return ((EObject) object).eClass().getEPackage() == PropertiesAdapterFactory.modelPackage;
         }
         return false;
     }
@@ -83,7 +84,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     /**
      * The switch that delegates to the <code>createXXX</code> methods. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     protected PropertiesSwitch<Adapter> modelSwitch = new PropertiesSwitch<Adapter>() {
@@ -158,6 +159,11 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
+        public Adapter caseRadioDescription(RadioDescription object) {
+            return createRadioDescriptionAdapter();
+        }
+
+        @Override
         public Adapter caseExtension(Extension object) {
             return createExtensionAdapter();
         }
@@ -392,6 +398,22 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.RadioDescription
+     * <em>Radio Description</em>}'. <!-- begin-user-doc --> This default
+     * implementation returns null so that we can easily ignore cases; it's
+     * useful to ignore a case when inheritance will catch all the cases anyway.
+     * <!-- end-user-doc -->
+     * 
+     * @return the new adapter.
+     * @see org.eclipse.sirius.properties.RadioDescription
+     * @generated
+     */
+    public Adapter createRadioDescriptionAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
      * {@link org.eclipse.sirius.properties.TextAreaDescription
      * <em>Text Area Description</em>}'. <!-- begin-user-doc --> This default
      * implementation returns null so that we can easily ignore cases; it's
@@ -413,7 +435,7 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
      * returns null so that we can easily ignore cases; it's useful to ignore a
      * case when inheritance will catch all the cases anyway. <!-- end-user-doc
      * -->
-     * 
+     *
      * @return the new adapter.
      * @see org.eclipse.sirius.viewpoint.description.Extension
      * @generated
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
index 8f58d82fe8..3e058d46d6 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/util/PropertiesSwitch.java
@@ -4,10 +4,10 @@
  * 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.util;
 
@@ -25,6 +25,7 @@ import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.LabelDescription;
 import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.RadioDescription;
 import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
@@ -58,8 +59,8 @@ public class PropertiesSwitch<T> {
      * @generated
      */
     public PropertiesSwitch() {
-        if (modelPackage == null) {
-            modelPackage = PropertiesPackage.eINSTANCE;
+        if (PropertiesSwitch.modelPackage == null) {
+            PropertiesSwitch.modelPackage = PropertiesPackage.eINSTANCE;
         }
     }
 
@@ -86,7 +87,7 @@ public class PropertiesSwitch<T> {
      * @generated
      */
     protected T doSwitch(EClass theEClass, EObject theEObject) {
-        if (theEClass.eContainer() == modelPackage) {
+        if (theEClass.eContainer() == PropertiesSwitch.modelPackage) {
             return doSwitch(theEClass.getClassifierID(), theEObject);
         } else {
             List<EClass> eSuperTypes = theEClass.getESuperTypes();
@@ -108,115 +109,148 @@ public class PropertiesSwitch<T> {
         case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION: {
             ViewExtensionDescription viewExtensionDescription = (ViewExtensionDescription) theEObject;
             T result = caseViewExtensionDescription(viewExtensionDescription);
-            if (result == null)
+            if (result == null) {
                 result = caseExtension(viewExtensionDescription);
-            if (result == null)
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case PropertiesPackage.PAGE_DESCRIPTION: {
             PageDescription pageDescription = (PageDescription) theEObject;
             T result = casePageDescription(pageDescription);
-            if (result == null)
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case PropertiesPackage.GROUP_DESCRIPTION: {
             GroupDescription groupDescription = (GroupDescription) theEObject;
             T result = caseGroupDescription(groupDescription);
-            if (result == null)
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case PropertiesPackage.CONTAINER_DESCRIPTION: {
             ContainerDescription containerDescription = (ContainerDescription) theEObject;
             T result = caseContainerDescription(containerDescription);
-            if (result == null)
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case PropertiesPackage.WIDGET_DESCRIPTION: {
             WidgetDescription widgetDescription = (WidgetDescription) theEObject;
             T result = caseWidgetDescription(widgetDescription);
-            if (result == null)
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case PropertiesPackage.TEXT_DESCRIPTION: {
             TextDescription textDescription = (TextDescription) theEObject;
             T result = caseTextDescription(textDescription);
-            if (result == null)
+            if (result == null) {
                 result = caseWidgetDescription(textDescription);
-            if (result == null)
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case PropertiesPackage.BUTTON_DESCRIPTION: {
             ButtonDescription buttonDescription = (ButtonDescription) theEObject;
             T result = caseButtonDescription(buttonDescription);
-            if (result == null)
+            if (result == null) {
                 result = caseWidgetDescription(buttonDescription);
-            if (result == null)
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case PropertiesPackage.LABEL_DESCRIPTION: {
             LabelDescription labelDescription = (LabelDescription) theEObject;
             T result = caseLabelDescription(labelDescription);
-            if (result == null)
+            if (result == null) {
                 result = caseWidgetDescription(labelDescription);
-            if (result == null)
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case PropertiesPackage.CHECKBOX_DESCRIPTION: {
             CheckboxDescription checkboxDescription = (CheckboxDescription) theEObject;
             T result = caseCheckboxDescription(checkboxDescription);
-            if (result == null)
+            if (result == null) {
                 result = caseWidgetDescription(checkboxDescription);
-            if (result == null)
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case PropertiesPackage.SELECT_DESCRIPTION: {
             SelectDescription selectDescription = (SelectDescription) theEObject;
             T result = caseSelectDescription(selectDescription);
-            if (result == null)
+            if (result == null) {
                 result = caseWidgetDescription(selectDescription);
-            if (result == null)
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case PropertiesPackage.DYNAMIC_MAPPING_FOR: {
             DynamicMappingFor dynamicMappingFor = (DynamicMappingFor) theEObject;
             T result = caseDynamicMappingFor(dynamicMappingFor);
-            if (result == null)
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case PropertiesPackage.DYNAMIC_MAPPING_SWITCH: {
             DynamicMappingSwitch dynamicMappingSwitch = (DynamicMappingSwitch) theEObject;
             T result = caseDynamicMappingSwitch(dynamicMappingSwitch);
-            if (result == null)
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case PropertiesPackage.DYNAMIC_MAPPING_CASE: {
             DynamicMappingCase dynamicMappingCase = (DynamicMappingCase) theEObject;
             T result = caseDynamicMappingCase(dynamicMappingCase);
-            if (result == null)
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         case PropertiesPackage.TEXT_AREA_DESCRIPTION: {
             TextAreaDescription textAreaDescription = (TextAreaDescription) theEObject;
             T result = caseTextAreaDescription(textAreaDescription);
-            if (result == null)
+            if (result == null) {
                 result = caseTextDescription(textAreaDescription);
-            if (result == null)
+            }
+            if (result == null) {
                 result = caseWidgetDescription(textAreaDescription);
-            if (result == null)
+            }
+            if (result == null) {
+                result = defaultCase(theEObject);
+            }
+            return result;
+        }
+        case PropertiesPackage.RADIO_DESCRIPTION: {
+            RadioDescription radioDescription = (RadioDescription) theEObject;
+            T result = caseRadioDescription(radioDescription);
+            if (result == null) {
+                result = caseWidgetDescription(radioDescription);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
+            }
             return result;
         }
         default:
@@ -447,6 +481,23 @@ public class PropertiesSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
+     * <em>Radio Description</em>'. <!-- begin-user-doc --> This implementation
+     * returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Radio Description</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseRadioDescription(RadioDescription object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
      * <em>Text Area Description</em>'. <!-- begin-user-doc --> This
      * implementation returns null; returning a non-null result will terminate
      * the switch. <!-- end-user-doc -->
diff --git a/incubation/org.eclipse.sirius.sample.properties.radio/.classpath b/incubation/org.eclipse.sirius.sample.properties.radio/.classpath
new file mode 100644
index 0000000000..39810b7d6c
--- /dev/null
+++ b/incubation/org.eclipse.sirius.sample.properties.radio/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+  <classpathentry kind="src" path="src"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+  <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/incubation/org.eclipse.sirius.sample.properties.radio/.project b/incubation/org.eclipse.sirius.sample.properties.radio/.project
new file mode 100644
index 0000000000..23886cfcb9
--- /dev/null
+++ b/incubation/org.eclipse.sirius.sample.properties.radio/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.sirius.sample.properties.radio</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/incubation/org.eclipse.sirius.sample.properties.radio/META-INF/MANIFEST.MF b/incubation/org.eclipse.sirius.sample.properties.radio/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..053e157f79
--- /dev/null
+++ b/incubation/org.eclipse.sirius.sample.properties.radio/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: my.project.design
+Bundle-SymbolicName: org.eclipse.sirius.sample.properties.checkbox;singleton:=true
+Bundle-Version: 1.0.0
+Bundle-Activator: my.project.design.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.sirius,
+ org.eclipse.sirius.common.acceleo.aql
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/incubation/org.eclipse.sirius.sample.properties.radio/build.properties b/incubation/org.eclipse.sirius.sample.properties.radio/build.properties
new file mode 100644
index 0000000000..c94531ff9e
--- /dev/null
+++ b/incubation/org.eclipse.sirius.sample.properties.radio/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               description/,\
+               plugin.xml
diff --git a/incubation/org.eclipse.sirius.sample.properties.radio/description/project.odesign b/incubation/org.eclipse.sirius.sample.properties.radio/description/project.odesign
new file mode 100644
index 0000000000..4b2c46665d
--- /dev/null
+++ b/incubation/org.eclipse.sirius.sample.properties.radio/description/project.odesign
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<description:Group
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:description="http://www.eclipse.org/sirius/description/1.1.0"
+    xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0"
+    xmlns:properties="http://www.eclipse.org/sirius/properties/1.0.0"
+    xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0"
+    xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0"
+    name="project"
+    version="11.0.0.201601261200">
+  <ownedViewpoints
+      name="Design">
+    <ownedRepresentations
+        xsi:type="description_1:DiagramDescription"
+        name="Class Diagram"
+        domainClass="ecore.EPackage"
+        enablePopupBars="true">
+      <defaultLayer
+          name="Default">
+        <containerMappings
+            name="CD_Class"
+            domainClass="ecore.EClass"
+            childrenPresentation="List">
+          <subNodeMappings
+              name="CD_Attribute"
+              semanticCandidatesExpression="feature:eAllContents"
+              domainClass="ecore.EAttribute">
+            <style
+                xsi:type="style:BundledImageDescription"
+                labelPosition="node"
+                resizeKind="NSEW">
+              <borderColor
+                  xsi:type="description:SystemColor"
+                  href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelColor
+                  xsi:type="description:SystemColor"
+                  href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <color
+                  xsi:type="description:SystemColor"
+                  href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </style>
+          </subNodeMappings>
+          <subNodeMappings
+              name="CD_Reference"
+              semanticCandidatesExpression="feature:eAllContents"
+              domainClass="ecore.EReference">
+            <style
+                xsi:type="style:BundledImageDescription"
+                labelPosition="node"
+                resizeKind="NSEW">
+              <borderColor
+                  xsi:type="description:SystemColor"
+                  href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelColor
+                  xsi:type="description:SystemColor"
+                  href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <color
+                  xsi:type="description:SystemColor"
+                  href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </style>
+          </subNodeMappings>
+          <style
+              xsi:type="style:FlatContainerStyleDescription"
+              borderSizeComputationExpression="1">
+            <borderColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <backgroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
+            <foregroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
+          </style>
+        </containerMappings>
+        <containerMappings
+            name="CD_Enum"
+            domainClass="ecore.EEnum"
+            childrenPresentation="List">
+          <subNodeMappings
+              name="CD_Literal"
+              semanticCandidatesExpression="feature:eAllContents"
+              domainClass="ecore.EEnumLiteral">
+            <style
+                xsi:type="style:BundledImageDescription"
+                labelPosition="node"
+                resizeKind="NSEW">
+              <borderColor
+                  xsi:type="description:SystemColor"
+                  href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelColor
+                  xsi:type="description:SystemColor"
+                  href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <color
+                  xsi:type="description:SystemColor"
+                  href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            </style>
+          </subNodeMappings>
+          <style
+              xsi:type="style:FlatContainerStyleDescription"
+              borderSizeComputationExpression="1">
+            <borderColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <backgroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
+            <foregroundColor
+                xsi:type="description:SystemColor"
+                href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
+          </style>
+        </containerMappings>
+      </defaultLayer>
+    </ownedRepresentations>
+  </ownedViewpoints>
+  <extensions
+      xsi:type="properties:ViewExtensionDescription"
+      identifier="Properties"
+      labelExpression="aql:self.name"
+      preconditionExpression="">
+    <pages identifier="Single EEnum"
+        labelExpression="aql:self.name"
+        domainClass="ecore.EEnum"
+        semanticCandidateExpression="var:self"
+        groups="//@extensions.0/@groups.0"/>
+    <groups
+        identifier="EEnum properties"
+        labelExpression=""
+        domainClass="ecore.EEnum"
+        semanticCandidateExpression="">
+      <container>
+        <widgets
+            xsi:type="properties:RadioDescription"
+            identifier="Enum properties"
+            labelExpression="aql:self.name"
+            valueExpression="aql:self.eLiterals->first()"
+            candidatesExpression="aql:self.eLiterals"
+            candidateDisplayExpression="aql:candidate.name">
+          <initialOperation>
+            <firstModelOperations
+                xsi:type="tool:SetValue"
+                featureName="eLiterals"
+                valueExpression="var:newValue"/>
+          </initialOperation>
+        </widgets>
+      </container>
+    </groups>
+  </extensions>
+</description:Group>
diff --git a/incubation/org.eclipse.sirius.sample.properties.radio/plugin.xml b/incubation/org.eclipse.sirius.sample.properties.radio/plugin.xml
new file mode 100644
index 0000000000..d6fa17bcad
--- /dev/null
+++ b/incubation/org.eclipse.sirius.sample.properties.radio/plugin.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+  <extension point="org.eclipse.sirius.componentization">
+    <component class="my.project.design.Activator"
+               id="my.project.design"
+	       name="project">
+    </component>
+  </extension>
+</plugin>
diff --git a/incubation/org.eclipse.sirius.sample.properties.radio/src/my/project/design/Activator.java b/incubation/org.eclipse.sirius.sample.properties.radio/src/my/project/design/Activator.java
new file mode 100644
index 0000000000..9f3153d28c
--- /dev/null
+++ b/incubation/org.eclipse.sirius.sample.properties.radio/src/my/project/design/Activator.java
@@ -0,0 +1,66 @@
+package my.project.design;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
+import org.eclipse.sirius.viewpoint.description.Viewpoint;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+    // The plug-in ID
+    public static final String PLUGIN_ID = "my.project.design";
+
+    // The shared instance
+    private static Activator plugin;
+
+    private static Set<Viewpoint> viewpoints; 
+
+    /**
+     * The constructor
+     */
+    public Activator() {
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+     */
+    public void start(BundleContext context) throws Exception {
+      super.start(context);
+	  plugin = this;
+	  viewpoints = new HashSet<Viewpoint>();
+	  viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/project.odesign")); 
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+     */
+    public void stop(BundleContext context) throws Exception {
+	plugin = null;
+	if (viewpoints != null) {
+	    for (final Viewpoint viewpoint: viewpoints) {
+		ViewpointRegistry.getInstance().disposeFromPlugin(viewpoint);
+	    }
+	    viewpoints.clear();
+	    viewpoints = null; 
+	}
+	super.stop(context);
+    }
+
+    /**
+     * Returns the shared instance
+     * 
+     * @return the shared instance
+     */
+    public static Activator getDefault() {
+	return plugin;
+    }
+}
diff --git a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
index 409b8b0ea6..038a0fe0f3 100644
--- a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
+++ b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
@@ -21,6 +21,7 @@ import org.eclipse.eef.EEFDynamicMappingSwitch;
 import org.eclipse.eef.EEFGroupDescription;
 import org.eclipse.eef.EEFLabelDescription;
 import org.eclipse.eef.EEFPageDescription;
+import org.eclipse.eef.EEFRadioDescription;
 import org.eclipse.eef.EEFSelectDescription;
 import org.eclipse.eef.EEFTextDescription;
 import org.eclipse.eef.EEFViewDescription;
@@ -35,6 +36,7 @@ import org.eclipse.sirius.properties.DynamicMappingSwitch;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.LabelDescription;
 import org.eclipse.sirius.properties.PageDescription;
+import org.eclipse.sirius.properties.RadioDescription;
 import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.TextAreaDescription;
 import org.eclipse.sirius.properties.TextDescription;
@@ -157,6 +159,8 @@ public class ViewDescriptionConverter {
             description = createEEFSelectDescription((SelectDescription) widgetDescription);
         } else if (widgetDescription instanceof ButtonDescription) {
             description = createEEFButtonDescription((ButtonDescription) widgetDescription);
+        } else if (widgetDescription instanceof RadioDescription) {
+            description = createEEFRadioDescription((RadioDescription) widgetDescription);
         }
 
         return description;
@@ -230,4 +234,15 @@ public class ViewDescriptionConverter {
         return eefSelectDescription;
     }
 
+    private EEFRadioDescription createEEFRadioDescription(RadioDescription radioDescription) {
+        EEFRadioDescription eefRadioDescription = EefFactory.eINSTANCE.createEEFRadioDescription();
+
+        eefRadioDescription.setIdentifier(radioDescription.getIdentifier());
+        eefRadioDescription.setLabelExpression(radioDescription.getLabelExpression());
+        eefRadioDescription.setValueExpression(radioDescription.getValueExpression());
+        eefRadioDescription.setCandidatesExpression(radioDescription.getCandidatesExpression());
+        eefRadioDescription.setCandidateDisplayExpression(radioDescription.getCandidateDisplayExpression());
+        return eefRadioDescription;
+    }
+
 }
author	Mélanie Bats	2016-02-02 16:24:53 +0000
committer	Pierre-Charles David	2016-02-16 14:28:56 +0000
commit	bd3aa22374d12a28b0f4c535caa0a669e0dba9fc (patch)
tree	92e8d60d5aa736b0f0ad3004beff14889033a262
parent	7385dbd097916fb48f32f30626d1b0a20d46dc42 (diff)
download	org.eclipse.sirius-bd3aa22374d12a28b0f4c535caa0a669e0dba9fc.tar.gz org.eclipse.sirius-bd3aa22374d12a28b0f4c535caa0a669e0dba9fc.tar.xz org.eclipse.sirius-bd3aa22374d12a28b0f4c535caa0a669e0dba9fc.zip