[482528] Add support for button widgets

Bug: 482528
Change-Id: I9da1cd9f529b51e59a548232881e3a6728dee521
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

109 files changed, 5376 insertions, 3989 deletions

diff --git a/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml b/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
index 5897e2c6ab..622ba8be5d 100644
--- a/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
+++ b/incubation/org.eclipse.sirius.editor.properties/help/contexts.xml
@@ -66,6 +66,17 @@
    
       </description>
    </context>
+   <context id="ButtonDescription">
+     <description>
+       
+       
+         
+   <!-- Start of user code ButtonDescription description -->
+   
+   <!-- End of user code ButtonDescription description -->
+   
+      </description>
+   </context>
    <context id="LabelDescription">
      <description>
        
@@ -77,6 +88,29 @@
    
       </description>
    </context>
+   <context id="CheckboxDescription">
+     <description>
+       
+       
+         
+   <!-- Start of user code CheckboxDescription description -->
+   
+   <!-- End of user code CheckboxDescription description -->
+   
+      </description>
+   </context>
+   <context id="SelectDescription">
+     <description>
+       Represents a collection of candidates used to edit a single or multi-valued property.
+
+       
+         
+   <!-- Start of user code SelectDescription description -->
+   
+   <!-- End of user code SelectDescription description -->
+   
+      </description>
+   </context>
    <context id="DynamicMappingFor">
      <description>
        
@@ -110,16 +144,4 @@
    
       </description>
    </context>
-   <context id="SelectDescription">
-     <description>
-       Represents a collection of candidates used to edit a single or multi-valued property.
-
-       
-         
-   <!-- Start of user code SelectDescription description -->
-   
-   <!-- End of user code SelectDescription 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 23cd7c3324..1b2651a8a8 100644
--- a/incubation/org.eclipse.sirius.editor.properties/plugin.xml
+++ b/incubation/org.eclipse.sirius.editor.properties/plugin.xml
@@ -19,29 +19,6 @@
   <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.selectdescription.SelectDescriptionCandidateDisplayExpressionPropertySection"
-               id="properties.section.selectDescription.CandidateDisplayExpression"
-               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.selectdescription.SelectDescriptionCandidateDisplayExpressionFilter"
-               afterSection="properties.section.selectDescription.CandidatesExpression"
-                tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.properties.SelectDescription"/>
-      </propertySection>
-  	  <propertySection
-               class="org.eclipse.sirius.properties.editor.properties.sections.properties.selectdescription.SelectDescriptionCandidatesExpressionPropertySection"
-               id="properties.section.selectDescription.CandidatesExpression"
-               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.selectdescription.SelectDescriptionCandidatesExpressionFilter"
-               afterSection="properties.section.selectDescription.ValueExpression"
-                tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.properties.SelectDescription"/>
-      </propertySection>
-  	  <propertySection
-               class="org.eclipse.sirius.properties.editor.properties.sections.properties.selectdescription.SelectDescriptionValueExpressionPropertySection"
-               id="properties.section.selectDescription.ValueExpression"
-               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.selectdescription.SelectDescriptionValueExpressionFilter"
-                tab="viewpoint.tab.general">
-        <input type="org.eclipse.sirius.properties.SelectDescription"/>
-      </propertySection>
-  	  <propertySection
                class="org.eclipse.sirius.properties.editor.properties.sections.properties.dynamicmappingcase.DynamicMappingCaseCaseExpressionPropertySection"
                id="properties.section.dynamicMappingCase.CaseExpression"
                filter="org.eclipse.sirius.properties.editor.properties.filters.properties.dynamicmappingcase.DynamicMappingCaseCaseExpressionFilter"
@@ -71,6 +48,43 @@
         <input type="org.eclipse.sirius.properties.DynamicMappingFor"/>
       </propertySection>
   	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.selectdescription.SelectDescriptionCandidateDisplayExpressionPropertySection"
+               id="properties.section.selectDescription.CandidateDisplayExpression"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.selectdescription.SelectDescriptionCandidateDisplayExpressionFilter"
+               afterSection="properties.section.selectDescription.CandidatesExpression"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.SelectDescription"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.selectdescription.SelectDescriptionCandidatesExpressionPropertySection"
+               id="properties.section.selectDescription.CandidatesExpression"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.selectdescription.SelectDescriptionCandidatesExpressionFilter"
+               afterSection="properties.section.selectDescription.ValueExpression"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.SelectDescription"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.selectdescription.SelectDescriptionValueExpressionPropertySection"
+               id="properties.section.selectDescription.ValueExpression"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.selectdescription.SelectDescriptionValueExpressionFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.SelectDescription"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.checkboxdescription.CheckboxDescriptionValueExpressionPropertySection"
+               id="properties.section.checkboxDescription.ValueExpression"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.checkboxdescription.CheckboxDescriptionValueExpressionFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.CheckboxDescription"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.properties.editor.properties.sections.properties.buttondescription.ButtonDescriptionButtonLabelExpressionPropertySection"
+               id="properties.section.buttonDescription.ButtonLabelExpression"
+               filter="org.eclipse.sirius.properties.editor.properties.filters.properties.buttondescription.ButtonDescriptionButtonLabelExpressionFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.properties.ButtonDescription"/>
+      </propertySection>
+  	  <propertySection
                class="org.eclipse.sirius.properties.editor.properties.sections.properties.textdescription.TextDescriptionValueExpressionPropertySection"
                id="properties.section.textDescription.ValueExpression"
                filter="org.eclipse.sirius.properties.editor.properties.filters.properties.textdescription.TextDescriptionValueExpressionFilter"
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
new file mode 100644
index 0000000000..d3fd2a0836
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/buttondescription/ButtonDescriptionButtonLabelExpressionFilter.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * 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.buttondescription;
+
+// 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 buttonLabelExpression property section.
+ */
+public class ButtonDescriptionButtonLabelExpressionFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getButtonDescription_ButtonLabelExpression();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.ButtonDescription;
+    }
+
+    // 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/checkboxdescription/CheckboxDescriptionValueExpressionFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/checkboxdescription/CheckboxDescriptionValueExpressionFilter.java
new file mode 100644
index 0000000000..be8d0f04cb
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/checkboxdescription/CheckboxDescriptionValueExpressionFilter.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * 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.checkboxdescription;
+
+// 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 CheckboxDescriptionValueExpressionFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    protected EStructuralFeature getFeature() {
+        return PropertiesPackage.eINSTANCE.getCheckboxDescription_ValueExpression();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.properties.CheckboxDescription;
+    }
+
+    // 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/containerdescription/ContainerDescriptionIdentifierFilter.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/filters/properties/containerdescription/ContainerDescriptionIdentifierFilter.java
index 4d6381da90..e6d00ff941 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 3b87578d3b..93e8bbf6ae 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 44e21659f7..baf5085dc3 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 2d7763528e..a75f1985d6 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 7fbe191b2d..5241681a04 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 bb36e08279..037d2392e4 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 104f200e8d..dbbe782a03 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 f8dd8e3151..a6bf6ca03e 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 961d7bea01..7246fc023e 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 38928ac0e4..8838748cf6 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 6f00849170..fb985bde92 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 a4d2e37205..c943166f7b 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 0ab6c7bf6d..6981e0b7ad 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 4ce4750a17..5e7395770a 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 eb11ad82d9..d2d2285ec0 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 f43381306a..6a68f97745 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 5487f853bb..1435c2c81a 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 bcdcb32f15..73d05448a3 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 7eaabf67a0..af6050c2ac 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 2d831a48b8..31d060f50e 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 d683d48e51..8d78177f98 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 b9e4279422..62addcf1a5 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 a187e8b50c..541e623c96 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 e14eb4336c..bb9da0aad2 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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
new file mode 100644
index 0000000000..4756c14c30
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/buttondescription/ButtonDescriptionButtonLabelExpressionPropertySection.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * 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.buttondescription;
+
+// 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 buttonLabelExpression property of a ButtonDescription
+ * object.
+ */
+public class ButtonDescriptionButtonLabelExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient {
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "ButtonLabelExpression"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
+     */
+    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()
+     */
+    public EAttribute getFeature() {
+        return PropertiesPackage.eINSTANCE.getButtonDescription_ButtonLabelExpression();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
+     */
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
+     */
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    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() {
+            public void widgetSelected(SelectionEvent e) {
+                TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), ButtonDescriptionButtonLabelExpressionPropertySection.this, text.getText());
+                dialog.open();
+                text.setText(dialog.getResult());
+                handleTextModified();
+            }
+        };
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    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/checkboxdescription/CheckboxDescriptionValueExpressionPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/checkboxdescription/CheckboxDescriptionValueExpressionPropertySection.java
new file mode 100644
index 0000000000..e603869f0c
--- /dev/null
+++ b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/checkboxdescription/CheckboxDescriptionValueExpressionPropertySection.java
@@ -0,0 +1,114 @@
+/*******************************************************************************
+ * 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.checkboxdescription;
+
+// 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 CheckboxDescription object.
+ */
+public class CheckboxDescriptionValueExpressionPropertySection extends AbstractTextWithButtonPropertySection implements ContentProposalClient {
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getDefaultLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "ValueExpression"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getLabelText()
+     */
+    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()
+     */
+    public EAttribute getFeature() {
+        return PropertiesPackage.eINSTANCE.getCheckboxDescription_ValueExpression();
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#getFeatureValue(String)
+     */
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.properties.editor.properties.sections.AbstractTextWithButtonPropertySection#isEqual(String)
+     */
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    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() {
+            public void widgetSelected(SelectionEvent e) {
+                TextWithContentProposalDialog dialog = new TextWithContentProposalDialog(composite.getShell(), CheckboxDescriptionValueExpressionPropertySection.this, text.getText());
+                dialog.open();
+                text.setText(dialog.getResult());
+                handleTextModified();
+            }
+        };
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    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/containerdescription/ContainerDescriptionIdentifierPropertySection.java b/incubation/org.eclipse.sirius.editor.properties/src-gen/org/eclipse/sirius/properties/editor/properties/sections/properties/containerdescription/ContainerDescriptionIdentifierPropertySection.java
index 69765ad2b7..92d82642a2 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 c2e6424015..3b74401a0a 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 2a0cc0fa87..ed74ed61a9 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 43eb681296..d212c975e8 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 facfff19fc..46e17c4939 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 02691f8657..a429203ee8 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 7636fb41fe..8128517e20 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 99b3b861ce..05d9f03a08 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 7e62e76a3b..1579dacbbf 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 aadcbe6dab..00052f02ab 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 564f33c91e..7104a0527d 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 3e03e3427d..7835c4728d 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 bc2d667eb1..deb56b251f 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 6df9a2a8b4..c06e9eda6e 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 ac8cf049c5..e9cacbe769 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 703463a785..ad30fb91a1 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 4fea002a0f..dcf090bcae 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 5187d02647..02e9fc863d 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 e812252b17..66eb827739 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 f2e944bf06..08c51e078a 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 ac9b431015..904564cbe0 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 00d13a1ab3..9ce25dcd10 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 07c35de9f7..a6508282b9 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
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 d5ecc1830e..96f127fb4f 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Obeo.
+ * Copyright (c) 2016 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateButtonDescription_initialOperation_InitialOperation.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateButtonDescription_initialOperation_InitialOperation.gif
new file mode 100644
index 0000000000..678bf2f585
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateButtonDescription_initialOperation_InitialOperation.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateContainerDescription_widgets_ButtonDescription.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateContainerDescription_widgets_ButtonDescription.gif
new file mode 100644
index 0000000000..6a0e6fcc49
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateContainerDescription_widgets_ButtonDescription.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateDynamicMappingCase_widget_ButtonDescription.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateDynamicMappingCase_widget_ButtonDescription.gif
new file mode 100644
index 0000000000..24670cfaec
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/ctool16/CreateDynamicMappingCase_widget_ButtonDescription.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/ButtonDescription.gif b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/ButtonDescription.gif
new file mode 100644
index 0000000000..2124f3e3ab
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/icons/full/obj16/ButtonDescription.gif
diff --git a/incubation/org.eclipse.sirius.properties.edit/plugin.properties b/incubation/org.eclipse.sirius.properties.edit/plugin.properties
index ba8c474b6c..07bdff1979 100644
--- a/incubation/org.eclipse.sirius.properties.edit/plugin.properties
+++ b/incubation/org.eclipse.sirius.properties.edit/plugin.properties
@@ -68,3 +68,7 @@ _UI_DynamicMappingCase_widget_feature = Widget
 _UI_CheckboxDescription_type = Checkbox Description
 _UI_CheckboxDescription_valueExpression_feature = Value Expression
 _UI_CheckboxDescription_initialOperation_feature = Initial Operation
+_UI_ButtonDescription_type = Button Description
+_UI_ButtonDescription_valueExpression_feature = Value Expression
+_UI_ButtonDescription_initialOperation_feature = Initial Operation
+_UI_ButtonDescription_buttonLabelExpression_feature = Button Label Expression
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
new file mode 100644
index 0000000000..e475c8c049
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
@@ -0,0 +1,168 @@
+/**
+ * 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.ButtonDescription;
+import org.eclipse.sirius.properties.PropertiesPackage;
+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) {
+        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);
+
+            addButtonLabelExpressionPropertyDescriptor(object);
+        }
+        return itemPropertyDescriptors;
+    }
+
+    /**
+     * This adds a property descriptor for the Button Label Expression feature.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    protected void addButtonLabelExpressionPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_ButtonDescription_buttonLabelExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_ButtonDescription_buttonLabelExpression_feature", "_UI_ButtonDescription_type"),
+                PropertiesPackage.Literals.BUTTON_DESCRIPTION__BUTTON_LABEL_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.BUTTON_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 ButtonDescription.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public Object getImage(Object object) {
+        return overlayImage(object, getResourceLocator().getImage("full/obj16/ButtonDescription"));
+    }
+
+    /**
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public String getText(Object object) {
+        String label = ((ButtonDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_ButtonDescription_type") : getString("_UI_ButtonDescription_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(ButtonDescription.class)) {
+        case PropertiesPackage.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        case PropertiesPackage.BUTTON_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.BUTTON_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
+    }
+
+}
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 4032f5d275..f8a0fb7254 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
@@ -11,36 +11,32 @@
  */
 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.CheckboxDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
-
 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 -->
+ * 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 -->
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public CheckboxDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -48,9 +44,9 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
     }
 
     /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -64,33 +60,26 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
     }
 
     /**
-     * This adds a property descriptor for the Value Expression feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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_CheckboxDescription_valueExpression_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_CheckboxDescription_valueExpression_feature", "_UI_CheckboxDescription_type"),
-                 PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_CheckboxDescription_valueExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_CheckboxDescription_valueExpression_feature", "_UI_CheckboxDescription_type"),
+                PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__VALUE_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 -->
+     * 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
@@ -103,22 +92,23 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- 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
+        // 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 CheckboxDescription.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns CheckboxDescription.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -127,25 +117,23 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
     }
 
     /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((CheckboxDescription)object).getIdentifier();
-        return label == null || label.length() == 0 ?
-            getString("_UI_CheckboxDescription_type") :
-            getString("_UI_CheckboxDescription_type") + " " + label;
+        String label = ((CheckboxDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_CheckboxDescription_type") : getString("_UI_CheckboxDescription_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 -->
+     * 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
@@ -153,31 +141,28 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
         updateChildren(notification);
 
         switch (notification.getFeatureID(CheckboxDescription.class)) {
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        case PropertiesPackage.CHECKBOX_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 -->
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add
-            (createChildParameter
-                (PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__INITIAL_OPERATION,
-                 ToolFactory.eINSTANCE.createInitialOperation()));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
     }
 
 }
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 e5b7af870d..061652afd5 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
@@ -11,17 +11,13 @@
  */
 package org.eclipse.sirius.properties.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -32,29 +28,23 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.sirius.properties.ContainerDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * 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,
+public class ContainerDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
         IItemPropertySource {
     /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public ContainerDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +52,9 @@ public class ContainerDescriptionItemProvider
     }
 
     /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -78,33 +68,26 @@ public class ContainerDescriptionItemProvider
     }
 
     /**
-     * This adds a property descriptor for the Identifier feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Identifier feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ContainerDescription_identifier_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ContainerDescription_identifier_feature", "_UI_ContainerDescription_type"),
-                 PropertiesPackage.Literals.CONTAINER_DESCRIPTION__IDENTIFIER,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_ContainerDescription_identifier_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_ContainerDescription_identifier_feature", "_UI_ContainerDescription_type"),
+                PropertiesPackage.Literals.CONTAINER_DESCRIPTION__IDENTIFIER, 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 -->
+     * 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
@@ -118,22 +101,23 @@ public class ContainerDescriptionItemProvider
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- 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
+        // 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 ContainerDescription.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns ContainerDescription.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -142,25 +126,23 @@ public class ContainerDescriptionItemProvider
     }
 
     /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((ContainerDescription)object).getIdentifier();
-        return label == null || label.length() == 0 ?
-            getString("_UI_ContainerDescription_type") :
-            getString("_UI_ContainerDescription_type") + " " + label;
+        String label = ((ContainerDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_ContainerDescription_type") : getString("_UI_ContainerDescription_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 -->
+     * 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
@@ -168,58 +150,45 @@ public class ContainerDescriptionItemProvider
         updateChildren(notification);
 
         switch (notification.getFeatureID(ContainerDescription.class)) {
-            case PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
-            case PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        case PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
+        case PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS:
+            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 -->
+     * 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.CONTAINER_DESCRIPTION__WIDGETS,
-                 PropertiesFactory.eINSTANCE.createTextDescription()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (PropertiesPackage.Literals.CONTAINER_DESCRIPTION__WIDGETS,
-                 PropertiesFactory.eINSTANCE.createLabelDescription()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (PropertiesPackage.Literals.CONTAINER_DESCRIPTION__WIDGETS,
-                 PropertiesFactory.eINSTANCE.createCheckboxDescription()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (PropertiesPackage.Literals.CONTAINER_DESCRIPTION__WIDGETS,
-                 PropertiesFactory.eINSTANCE.createSelectDescription()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (PropertiesPackage.Literals.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS,
-                 PropertiesFactory.eINSTANCE.createDynamicMappingFor()));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__WIDGETS, PropertiesFactory.eINSTANCE.createTextDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__WIDGETS, PropertiesFactory.eINSTANCE.createButtonDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__WIDGETS, PropertiesFactory.eINSTANCE.createLabelDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__WIDGETS, PropertiesFactory.eINSTANCE.createCheckboxDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.CONTAINER_DESCRIPTION__WIDGETS, PropertiesFactory.eINSTANCE.createSelectDescription()));
+
+        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 -->
+     * 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 2e19c183f7..7161c6485f 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
@@ -11,17 +11,13 @@
  */
 package org.eclipse.sirius.properties.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -32,29 +28,23 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.sirius.properties.DynamicMappingCase;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.sirius.properties.DynamicMappingCase} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * 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,
+public class DynamicMappingCaseItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
         IItemPropertySource {
     /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public DynamicMappingCaseItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +52,9 @@ public class DynamicMappingCaseItemProvider
     }
 
     /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -78,33 +68,26 @@ public class DynamicMappingCaseItemProvider
     }
 
     /**
-     * This adds a property descriptor for the Case Expression feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Case Expression feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addCaseExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DynamicMappingCase_caseExpression_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DynamicMappingCase_caseExpression_feature", "_UI_DynamicMappingCase_type"),
-                 PropertiesPackage.Literals.DYNAMIC_MAPPING_CASE__CASE_EXPRESSION,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_DynamicMappingCase_caseExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_DynamicMappingCase_caseExpression_feature", "_UI_DynamicMappingCase_type"),
+                PropertiesPackage.Literals.DYNAMIC_MAPPING_CASE__CASE_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 -->
+     * 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
@@ -117,22 +100,23 @@ public class DynamicMappingCaseItemProvider
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- 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
+        // 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 DynamicMappingCase.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns DynamicMappingCase.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -141,25 +125,23 @@ public class DynamicMappingCaseItemProvider
     }
 
     /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((DynamicMappingCase)object).getCaseExpression();
-        return label == null || label.length() == 0 ?
-            getString("_UI_DynamicMappingCase_type") :
-            getString("_UI_DynamicMappingCase_type") + " " + label;
+        String label = ((DynamicMappingCase) object).getCaseExpression();
+        return label == null || label.length() == 0 ? getString("_UI_DynamicMappingCase_type") : getString("_UI_DynamicMappingCase_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 -->
+     * 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
@@ -167,52 +149,42 @@ public class DynamicMappingCaseItemProvider
         updateChildren(notification);
 
         switch (notification.getFeatureID(DynamicMappingCase.class)) {
-            case PropertiesPackage.DYNAMIC_MAPPING_CASE__CASE_EXPRESSION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        case PropertiesPackage.DYNAMIC_MAPPING_CASE__CASE_EXPRESSION:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        case PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET:
+            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 -->
+     * 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.DYNAMIC_MAPPING_CASE__WIDGET,
-                 PropertiesFactory.eINSTANCE.createTextDescription()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (PropertiesPackage.Literals.DYNAMIC_MAPPING_CASE__WIDGET,
-                 PropertiesFactory.eINSTANCE.createLabelDescription()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (PropertiesPackage.Literals.DYNAMIC_MAPPING_CASE__WIDGET,
-                 PropertiesFactory.eINSTANCE.createCheckboxDescription()));
-
-        newChildDescriptors.add
-            (createChildParameter
-                (PropertiesPackage.Literals.DYNAMIC_MAPPING_CASE__WIDGET,
-                 PropertiesFactory.eINSTANCE.createSelectDescription()));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.DYNAMIC_MAPPING_CASE__WIDGET, PropertiesFactory.eINSTANCE.createTextDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.DYNAMIC_MAPPING_CASE__WIDGET, PropertiesFactory.eINSTANCE.createButtonDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.DYNAMIC_MAPPING_CASE__WIDGET, PropertiesFactory.eINSTANCE.createLabelDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.DYNAMIC_MAPPING_CASE__WIDGET, PropertiesFactory.eINSTANCE.createCheckboxDescription()));
+
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.DYNAMIC_MAPPING_CASE__WIDGET, PropertiesFactory.eINSTANCE.createSelectDescription()));
     }
 
     /**
-     * Return the resource locator for this item provider's resources.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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 fc5396f8df..19815ab625 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
@@ -11,17 +11,13 @@
  */
 package org.eclipse.sirius.properties.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -32,29 +28,23 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.sirius.properties.DynamicMappingFor;
 import org.eclipse.sirius.properties.PropertiesFactory;
 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 -->
+ * 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,
+public class DynamicMappingForItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
         IItemPropertySource {
     /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public DynamicMappingForItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +52,9 @@ public class DynamicMappingForItemProvider
     }
 
     /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -79,55 +69,38 @@ public class DynamicMappingForItemProvider
     }
 
     /**
-     * This adds a property descriptor for the Iterator feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Iterator feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addIteratorPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DynamicMappingFor_iterator_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DynamicMappingFor_iterator_feature", "_UI_DynamicMappingFor_type"),
-                 PropertiesPackage.Literals.DYNAMIC_MAPPING_FOR__ITERATOR,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_DynamicMappingFor_iterator_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DynamicMappingFor_iterator_feature", "_UI_DynamicMappingFor_type"),
+                PropertiesPackage.Literals.DYNAMIC_MAPPING_FOR__ITERATOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
      * This adds a property descriptor for the Domain Class Expression feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addDomainClassExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DynamicMappingFor_domainClassExpression_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DynamicMappingFor_domainClassExpression_feature", "_UI_DynamicMappingFor_type"),
-                 PropertiesPackage.Literals.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_DynamicMappingFor_domainClassExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_DynamicMappingFor_domainClassExpression_feature", "_UI_DynamicMappingFor_type"),
+                PropertiesPackage.Literals.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_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 -->
+     * 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
@@ -140,22 +113,23 @@ public class DynamicMappingForItemProvider
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- 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
+        // 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 DynamicMappingFor.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns DynamicMappingFor.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -164,25 +138,23 @@ public class DynamicMappingForItemProvider
     }
 
     /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((DynamicMappingFor)object).getIterator();
-        return label == null || label.length() == 0 ?
-            getString("_UI_DynamicMappingFor_type") :
-            getString("_UI_DynamicMappingFor_type") + " " + label;
+        String label = ((DynamicMappingFor) object).getIterator();
+        return label == null || label.length() == 0 ? getString("_UI_DynamicMappingFor_type") : getString("_UI_DynamicMappingFor_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 -->
+     * 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
@@ -190,38 +162,35 @@ public class DynamicMappingForItemProvider
         updateChildren(notification);
 
         switch (notification.getFeatureID(DynamicMappingFor.class)) {
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR:
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR:
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH:
+            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 -->
+     * 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.DYNAMIC_MAPPING_FOR__SWITCH,
-                 PropertiesFactory.eINSTANCE.createDynamicMappingSwitch()));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.DYNAMIC_MAPPING_FOR__SWITCH, PropertiesFactory.eINSTANCE.createDynamicMappingSwitch()));
     }
 
     /**
-     * Return the resource locator for this item provider's resources.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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 eae1c074c0..b61f1b3f01 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
@@ -11,17 +11,13 @@
  */
 package org.eclipse.sirius.properties.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -32,29 +28,23 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.sirius.properties.DynamicMappingSwitch;
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.sirius.properties.DynamicMappingSwitch} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * 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,
+public class DynamicMappingSwitchItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
         IItemPropertySource {
     /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public DynamicMappingSwitchItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +52,9 @@ public class DynamicMappingSwitchItemProvider
     }
 
     /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -78,33 +68,26 @@ public class DynamicMappingSwitchItemProvider
     }
 
     /**
-     * This adds a property descriptor for the Switch Expression feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Switch Expression feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addSwitchExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_DynamicMappingSwitch_switchExpression_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_DynamicMappingSwitch_switchExpression_feature", "_UI_DynamicMappingSwitch_type"),
-                 PropertiesPackage.Literals.DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_DynamicMappingSwitch_switchExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_DynamicMappingSwitch_switchExpression_feature", "_UI_DynamicMappingSwitch_type"),
+                PropertiesPackage.Literals.DYNAMIC_MAPPING_SWITCH__SWITCH_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 -->
+     * 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
@@ -117,22 +100,23 @@ public class DynamicMappingSwitchItemProvider
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- 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
+        // 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 DynamicMappingSwitch.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns DynamicMappingSwitch.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -141,25 +125,23 @@ public class DynamicMappingSwitchItemProvider
     }
 
     /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((DynamicMappingSwitch)object).getSwitchExpression();
-        return label == null || label.length() == 0 ?
-            getString("_UI_DynamicMappingSwitch_type") :
-            getString("_UI_DynamicMappingSwitch_type") + " " + label;
+        String label = ((DynamicMappingSwitch) object).getSwitchExpression();
+        return label == null || label.length() == 0 ? getString("_UI_DynamicMappingSwitch_type") : getString("_UI_DynamicMappingSwitch_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 -->
+     * 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
@@ -167,37 +149,34 @@ public class DynamicMappingSwitchItemProvider
         updateChildren(notification);
 
         switch (notification.getFeatureID(DynamicMappingSwitch.class)) {
-            case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES:
+            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 -->
+     * 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.DYNAMIC_MAPPING_SWITCH__CASES,
-                 PropertiesFactory.eINSTANCE.createDynamicMappingCase()));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.DYNAMIC_MAPPING_SWITCH__CASES, PropertiesFactory.eINSTANCE.createDynamicMappingCase()));
     }
 
     /**
-     * Return the resource locator for this item provider's resources.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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 9a06b6879f..9b5f8dfa46 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
@@ -11,17 +11,13 @@
  */
 package org.eclipse.sirius.properties.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -32,29 +28,23 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.PropertiesFactory;
 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 -->
+ * 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,
+public class GroupDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
         IItemPropertySource {
     /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public GroupDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +52,9 @@ public class GroupDescriptionItemProvider
     }
 
     /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -81,99 +71,63 @@ public class GroupDescriptionItemProvider
     }
 
     /**
-     * This adds a property descriptor for the Identifier feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Identifier feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GroupDescription_identifier_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_identifier_feature", "_UI_GroupDescription_type"),
-                 PropertiesPackage.Literals.GROUP_DESCRIPTION__IDENTIFIER,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_GroupDescription_identifier_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_identifier_feature", "_UI_GroupDescription_type"),
+                PropertiesPackage.Literals.GROUP_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
-     * This adds a property descriptor for the Label Expression feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Label Expression feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GroupDescription_labelExpression_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_labelExpression_feature", "_UI_GroupDescription_type"),
-                 PropertiesPackage.Literals.GROUP_DESCRIPTION__LABEL_EXPRESSION,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_GroupDescription_labelExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_labelExpression_feature", "_UI_GroupDescription_type"),
+                PropertiesPackage.Literals.GROUP_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
-     * This adds a property descriptor for the Domain Class feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Domain Class feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GroupDescription_domainClass_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_domainClass_feature", "_UI_GroupDescription_type"),
-                 PropertiesPackage.Literals.GROUP_DESCRIPTION__DOMAIN_CLASS,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_GroupDescription_domainClass_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_domainClass_feature", "_UI_GroupDescription_type"),
+                PropertiesPackage.Literals.GROUP_DESCRIPTION__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
-     * This adds a property descriptor for the Semantic Candidate Expression feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Semantic Candidate Expression
+     * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addSemanticCandidateExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_GroupDescription_semanticCandidateExpression_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_semanticCandidateExpression_feature", "_UI_GroupDescription_type"),
-                 PropertiesPackage.Literals.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_GroupDescription_semanticCandidateExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_semanticCandidateExpression_feature", "_UI_GroupDescription_type"),
+                PropertiesPackage.Literals.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_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 -->
+     * 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
@@ -186,22 +140,23 @@ public class GroupDescriptionItemProvider
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- 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
+        // 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 GroupDescription.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns GroupDescription.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -210,25 +165,23 @@ public class GroupDescriptionItemProvider
     }
 
     /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((GroupDescription)object).getIdentifier();
-        return label == null || label.length() == 0 ?
-            getString("_UI_GroupDescription_type") :
-            getString("_UI_GroupDescription_type") + " " + label;
+        String label = ((GroupDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_GroupDescription_type") : getString("_UI_GroupDescription_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 -->
+     * 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
@@ -236,40 +189,37 @@ public class GroupDescriptionItemProvider
         updateChildren(notification);
 
         switch (notification.getFeatureID(GroupDescription.class)) {
-            case PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER:
-            case PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION:
-            case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
-            case PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        case PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER:
+        case PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION:
+        case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
+        case PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
+            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 -->
+     * 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.GROUP_DESCRIPTION__CONTAINER,
-                 PropertiesFactory.eINSTANCE.createContainerDescription()));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.GROUP_DESCRIPTION__CONTAINER, PropertiesFactory.eINSTANCE.createContainerDescription()));
     }
 
     /**
-     * Return the resource locator for this item provider's resources.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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 dd044f3d8c..b4904c85f1 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
@@ -11,28 +11,26 @@
  */
 package org.eclipse.sirius.properties.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-
 import org.eclipse.sirius.properties.LabelDescription;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.sirius.properties.LabelDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * 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 -->
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public LabelDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -40,9 +38,9 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
     }
 
     /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -55,9 +53,9 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
     }
 
     /**
-     * This returns LabelDescription.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns LabelDescription.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -66,25 +64,23 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
     }
 
     /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((LabelDescription)object).getIdentifier();
-        return label == null || label.length() == 0 ?
-            getString("_UI_LabelDescription_type") :
-            getString("_UI_LabelDescription_type") + " " + label;
+        String label = ((LabelDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_LabelDescription_type") : getString("_UI_LabelDescription_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 -->
+     * 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
@@ -94,10 +90,10 @@ 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 -->
+     * 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 c49264b069..8f96f28faa 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
@@ -11,15 +11,12 @@
  */
 package org.eclipse.sirius.properties.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -30,28 +27,22 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.sirius.properties.PageDescription;
 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 -->
+ * 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,
+public class PageDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
         IItemPropertySource {
     /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public PageDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -59,9 +50,9 @@ public class PageDescriptionItemProvider
     }
 
     /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -79,119 +70,70 @@ public class PageDescriptionItemProvider
     }
 
     /**
-     * This adds a property descriptor for the Identifier feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Identifier feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_PageDescription_identifier_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_identifier_feature", "_UI_PageDescription_type"),
-                 PropertiesPackage.Literals.PAGE_DESCRIPTION__IDENTIFIER,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_PageDescription_identifier_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_identifier_feature", "_UI_PageDescription_type"),
+                PropertiesPackage.Literals.PAGE_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
-     * This adds a property descriptor for the Label Expression feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Label Expression feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_PageDescription_labelExpression_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_labelExpression_feature", "_UI_PageDescription_type"),
-                 PropertiesPackage.Literals.PAGE_DESCRIPTION__LABEL_EXPRESSION,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_PageDescription_labelExpression_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_labelExpression_feature", "_UI_PageDescription_type"),
+                PropertiesPackage.Literals.PAGE_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
-     * This adds a property descriptor for the Domain Class feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Domain Class feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addDomainClassPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_PageDescription_domainClass_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_domainClass_feature", "_UI_PageDescription_type"),
-                 PropertiesPackage.Literals.PAGE_DESCRIPTION__DOMAIN_CLASS,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_PageDescription_domainClass_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_domainClass_feature", "_UI_PageDescription_type"),
+                PropertiesPackage.Literals.PAGE_DESCRIPTION__DOMAIN_CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
-     * This adds a property descriptor for the Semantic Candidate Expression feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Semantic Candidate Expression
+     * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addSemanticCandidateExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_PageDescription_semanticCandidateExpression_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_semanticCandidateExpression_feature", "_UI_PageDescription_type"),
-                 PropertiesPackage.Literals.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_PageDescription_semanticCandidateExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_semanticCandidateExpression_feature", "_UI_PageDescription_type"),
+                PropertiesPackage.Literals.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
-     * This adds a property descriptor for the Groups feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Groups feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addGroupsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_PageDescription_groups_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_groups_feature", "_UI_PageDescription_type"),
-                 PropertiesPackage.Literals.PAGE_DESCRIPTION__GROUPS,
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_PageDescription_groups_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PageDescription_groups_feature", "_UI_PageDescription_type"),
+                PropertiesPackage.Literals.PAGE_DESCRIPTION__GROUPS, true, false, true, null, null, null));
     }
 
     /**
-     * This returns PageDescription.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns PageDescription.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -200,25 +142,23 @@ public class PageDescriptionItemProvider
     }
 
     /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((PageDescription)object).getIdentifier();
-        return label == null || label.length() == 0 ?
-            getString("_UI_PageDescription_type") :
-            getString("_UI_PageDescription_type") + " " + label;
+        String label = ((PageDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_PageDescription_type") : getString("_UI_PageDescription_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 -->
+     * 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
@@ -226,21 +166,21 @@ public class PageDescriptionItemProvider
         updateChildren(notification);
 
         switch (notification.getFeatureID(PageDescription.class)) {
-            case PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER:
-            case PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION:
-            case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
-            case PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        case PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER:
+        case PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION:
+        case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
+        case PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
         }
         super.notifyChanged(notification);
     }
 
     /**
-     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-     * that can be created under this object.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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
@@ -249,9 +189,9 @@ public class PageDescriptionItemProvider
     }
 
     /**
-     * Return the resource locator for this item provider's resources.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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 f636caf86c..c0ebac115c 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
@@ -12,54 +12,46 @@
 package org.eclipse.sirius.properties.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
- * This is the central singleton for the Properties edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * 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 -->
+     * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
      * @generated
      */
     public static final PropertiesEditPlugin INSTANCE = new PropertiesEditPlugin();
 
     /**
-     * Keep track of the singleton.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
      * @generated
      */
     private static Implementation plugin;
 
     /**
-     * Create the instance.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public PropertiesEditPlugin() {
-        super
-          (new ResourceLocator [] {
-             EcoreEditPlugin.INSTANCE,
-             SiriusEditPlugin.INSTANCE,
-           });
+        super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE, SiriusEditPlugin.INSTANCE, });
     }
 
     /**
-     * Returns the singleton instance of the Eclipse plugin.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @return the singleton instance.
      * @generated
      */
@@ -69,9 +61,9 @@ public final class PropertiesEditPlugin extends EMFPlugin {
     }
 
     /**
-     * Returns the singleton instance of the Eclipse plugin.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @return the singleton instance.
      * @generated
      */
@@ -80,16 +72,15 @@ public final class PropertiesEditPlugin extends EMFPlugin {
     }
 
     /**
-     * The actual implementation of the Eclipse <b>Plugin</b>.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The actual implementation of the Eclipse <b>Plugin</b>. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public static class Implementation extends EclipsePlugin {
         /**
-         * Creates an instance.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         public Implementation() {
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
index 82c63ad109..b8d0775cc2 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
@@ -18,15 +18,10 @@ import java.util.List;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.edit.command.CommandParameter;
-
 import org.eclipse.emf.edit.domain.EditingDomain;
-
 import org.eclipse.emf.edit.provider.ChangeNotifier;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -39,54 +34,53 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.sirius.properties.PropertiesFactory;
-
 import org.eclipse.sirius.properties.util.PropertiesAdapterFactory;
-
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.Group;
-
 import org.eclipse.sirius.viewpoint.description.util.DescriptionSwitch;
 
 /**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the factory that is used to provide the interfaces needed to support
+ * Viewers. The adapters generated by this factory convert EMF adapter
+ * notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The
+ * adapters also support Eclipse property sheets. Note that most of the adapters
+ * are shared among multiple instances. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
     /**
-     * This keeps track of the root adapter factory that delegates to this adapter factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This keeps track of the root adapter factory that delegates to this
+     * adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected ComposedAdapterFactory parentAdapterFactory;
 
     /**
-     * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This is used to implement
+     * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected IChangeNotifier changeNotifier = new ChangeNotifier();
 
     /**
-     * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This keeps track of all the supported types checked by
+     * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     protected Collection<Object> supportedTypes = new ArrayList<Object>();
 
     /**
-     * This constructs an instance.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
      * @generated
      */
     public PropertiesItemProviderAdapterFactory() {
@@ -98,17 +92,19 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.properties.ViewExtensionDescription} instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.ViewExtensionDescription} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected ViewExtensionDescriptionItemProvider viewExtensionDescriptionItemProvider;
 
     /**
-     * This creates an adapter for a {@link org.eclipse.sirius.properties.ViewExtensionDescription}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.ViewExtensionDescription}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -121,17 +117,19 @@ 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 -->
+     * 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;
 
     /**
-     * This creates an adapter for a {@link org.eclipse.sirius.properties.PageDescription}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.PageDescription}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -144,17 +142,19 @@ 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 -->
+     * 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;
 
     /**
-     * This creates an adapter for a {@link org.eclipse.sirius.properties.GroupDescription}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.GroupDescription}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -167,17 +167,19 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.properties.ContainerDescription} instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.ContainerDescription} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected ContainerDescriptionItemProvider containerDescriptionItemProvider;
 
     /**
-     * This creates an adapter for a {@link org.eclipse.sirius.properties.ContainerDescription}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.ContainerDescription}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -190,17 +192,19 @@ 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 -->
+     * 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;
 
     /**
-     * This creates an adapter for a {@link org.eclipse.sirius.properties.TextDescription}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.TextDescription}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -213,17 +217,44 @@ 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 -->
+     * 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;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.ButtonDescription}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public Adapter createButtonDescriptionAdapter() {
+        if (buttonDescriptionItemProvider == null) {
+            buttonDescriptionItemProvider = new ButtonDescriptionItemProvider(this);
+        }
+
+        return buttonDescriptionItemProvider;
+    }
+
+    /**
+     * 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;
 
     /**
-     * This creates an adapter for a {@link org.eclipse.sirius.properties.LabelDescription}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.LabelDescription}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -236,17 +267,19 @@ 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 -->
+     * 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;
 
     /**
-     * This creates an adapter for a {@link org.eclipse.sirius.properties.CheckboxDescription}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.CheckboxDescription}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -259,17 +292,19 @@ 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 -->
+     * 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;
 
     /**
-     * This creates an adapter for a {@link org.eclipse.sirius.properties.SelectDescription}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.SelectDescription}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -282,17 +317,19 @@ 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 -->
+     * 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;
 
     /**
-     * This creates an adapter for a {@link org.eclipse.sirius.properties.DynamicMappingFor}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.DynamicMappingFor}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -305,17 +342,19 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.properties.DynamicMappingSwitch} instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.properties.DynamicMappingSwitch} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected DynamicMappingSwitchItemProvider dynamicMappingSwitchItemProvider;
 
     /**
-     * This creates an adapter for a {@link org.eclipse.sirius.properties.DynamicMappingSwitch}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.DynamicMappingSwitch}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -328,17 +367,19 @@ 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 -->
+     * 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;
 
     /**
-     * This creates an adapter for a {@link org.eclipse.sirius.properties.DynamicMappingCase}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.properties.DynamicMappingCase}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -351,9 +392,9 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This returns the root adapter factory that contains this factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the root adapter factory that contains this factory. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public ComposeableAdapterFactory getRootAdapterFactory() {
@@ -361,9 +402,9 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This sets the composed adapter factory that contains this factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This sets the composed adapter factory that contains this factory. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
@@ -371,8 +412,8 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -381,9 +422,9 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This implementation substitutes the factory itself as the key for the adapter.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This implementation substitutes the factory itself as the key for the
+     * adapter. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -392,15 +433,15 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public Object adapt(Object object, Object type) {
         if (isFactoryForType(type)) {
             Object adapter = super.adapt(object, type);
-            if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+            if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
                 return adapter;
             }
         }
@@ -409,9 +450,8 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This adds a listener.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -419,9 +459,8 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This removes a listener.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -429,9 +468,10 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This delegates to {@link #changeNotifier} and to
+     * {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
+     * -->
+     * 
      * @generated
      */
     public void fireNotifyChanged(Notification notification) {
@@ -443,83 +483,94 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
     }
 
     /**
-     * This disposes all of the item providers created by this factory. 
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This disposes all of the item providers created by this factory. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void dispose() {
-        if (viewExtensionDescriptionItemProvider != null) viewExtensionDescriptionItemProvider.dispose();
-        if (pageDescriptionItemProvider != null) pageDescriptionItemProvider.dispose();
-        if (groupDescriptionItemProvider != null) groupDescriptionItemProvider.dispose();
-        if (containerDescriptionItemProvider != null) containerDescriptionItemProvider.dispose();
-        if (textDescriptionItemProvider != null) textDescriptionItemProvider.dispose();
-        if (labelDescriptionItemProvider != null) labelDescriptionItemProvider.dispose();
-        if (checkboxDescriptionItemProvider != null) checkboxDescriptionItemProvider.dispose();
-        if (selectDescriptionItemProvider != null) selectDescriptionItemProvider.dispose();
-        if (dynamicMappingForItemProvider != null) dynamicMappingForItemProvider.dispose();
-        if (dynamicMappingSwitchItemProvider != null) dynamicMappingSwitchItemProvider.dispose();
-        if (dynamicMappingCaseItemProvider != null) dynamicMappingCaseItemProvider.dispose();
+        if (viewExtensionDescriptionItemProvider != null)
+            viewExtensionDescriptionItemProvider.dispose();
+        if (pageDescriptionItemProvider != null)
+            pageDescriptionItemProvider.dispose();
+        if (groupDescriptionItemProvider != null)
+            groupDescriptionItemProvider.dispose();
+        if (containerDescriptionItemProvider != null)
+            containerDescriptionItemProvider.dispose();
+        if (textDescriptionItemProvider != null)
+            textDescriptionItemProvider.dispose();
+        if (buttonDescriptionItemProvider != null)
+            buttonDescriptionItemProvider.dispose();
+        if (labelDescriptionItemProvider != null)
+            labelDescriptionItemProvider.dispose();
+        if (checkboxDescriptionItemProvider != null)
+            checkboxDescriptionItemProvider.dispose();
+        if (selectDescriptionItemProvider != null)
+            selectDescriptionItemProvider.dispose();
+        if (dynamicMappingForItemProvider != null)
+            dynamicMappingForItemProvider.dispose();
+        if (dynamicMappingSwitchItemProvider != null)
+            dynamicMappingSwitchItemProvider.dispose();
+        if (dynamicMappingCaseItemProvider != null)
+            dynamicMappingCaseItemProvider.dispose();
     }
 
     /**
-     * A child creation extender for the {@link DescriptionPackage}.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * A child creation extender for the {@link DescriptionPackage}. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public static class DescriptionChildCreationExtender implements IChildCreationExtender {
         /**
-         * The switch for creating child descriptors specific to each extended class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The switch for creating child descriptors specific to each extended
+         * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         protected static class CreationSwitch extends DescriptionSwitch<Object> {
             /**
-             * The child descriptors being populated.
-             * <!-- begin-user-doc -->
+             * The child descriptors being populated. <!-- begin-user-doc -->
              * <!-- end-user-doc -->
+             * 
              * @generated
              */
             protected List<Object> newChildDescriptors;
 
             /**
-             * The domain in which to create the children.
-             * <!-- begin-user-doc -->
-             * <!-- end-user-doc -->
+             * The domain in which to create the children. <!-- begin-user-doc
+             * --> <!-- end-user-doc -->
+             * 
              * @generated
              */
             protected EditingDomain editingDomain;
 
             /**
-             * Creates the a switch for populating child descriptors in the given domain.
-             * <!-- begin-user-doc -->
-             * <!-- end-user-doc -->
+             * Creates the a switch for populating child descriptors in the
+             * given domain. <!-- begin-user-doc --> <!-- end-user-doc -->
+             * 
              * @generated
              */
             CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
                 this.newChildDescriptors = newChildDescriptors;
                 this.editingDomain = editingDomain;
             }
+
             /**
-             * <!-- begin-user-doc -->
-             * <!-- end-user-doc -->
+             * <!-- begin-user-doc --> <!-- end-user-doc -->
+             * 
              * @generated
              */
             @Override
             public Object caseGroup(Group object) {
-                newChildDescriptors.add
-                    (createChildParameter
-                        (DescriptionPackage.Literals.GROUP__EXTENSIONS,
-                         PropertiesFactory.eINSTANCE.createViewExtensionDescription()));
+                newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.GROUP__EXTENSIONS, PropertiesFactory.eINSTANCE.createViewExtensionDescription()));
 
                 return null;
             }
- 
+
             /**
-             * <!-- begin-user-doc -->
-             * <!-- end-user-doc -->
+             * <!-- begin-user-doc --> <!-- end-user-doc -->
+             * 
              * @generated
              */
             protected CommandParameter createChildParameter(Object feature, Object child) {
@@ -529,19 +580,19 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
         }
 
         /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
             ArrayList<Object> result = new ArrayList<Object>();
-            new CreationSwitch(result, editingDomain).doSwitch((EObject)object);
+            new CreationSwitch(result, editingDomain).doSwitch((EObject) object);
             return result;
         }
 
         /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         public ResourceLocator getResourceLocator() {
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 d1a085c5e8..4ab1ab3310 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
@@ -11,36 +11,32 @@
  */
 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.SelectDescription;
-
 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 -->
+ * 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 -->
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public SelectDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -48,9 +44,9 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
     }
 
     /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -66,77 +62,52 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
     }
 
     /**
-     * This adds a property descriptor for the Value Expression feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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_SelectDescription_valueExpression_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_valueExpression_feature", "_UI_SelectDescription_type"),
-                 PropertiesPackage.Literals.SELECT_DESCRIPTION__VALUE_EXPRESSION,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_SelectDescription_valueExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_valueExpression_feature", "_UI_SelectDescription_type"),
+                PropertiesPackage.Literals.SELECT_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 -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addCandidatesExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_SelectDescription_candidatesExpression_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_candidatesExpression_feature", "_UI_SelectDescription_type"),
-                 PropertiesPackage.Literals.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_SelectDescription_candidatesExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_candidatesExpression_feature", "_UI_SelectDescription_type"),
+                PropertiesPackage.Literals.SELECT_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 -->
+     * 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_SelectDescription_candidateDisplayExpression_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_candidateDisplayExpression_feature", "_UI_SelectDescription_type"),
-                 PropertiesPackage.Literals.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_SelectDescription_candidateDisplayExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_candidateDisplayExpression_feature", "_UI_SelectDescription_type"),
+                PropertiesPackage.Literals.SELECT_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 -->
+     * 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
@@ -149,22 +120,23 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- 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
+        // 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 SelectDescription.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns SelectDescription.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -173,25 +145,23 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
     }
 
     /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((SelectDescription)object).getIdentifier();
-        return label == null || label.length() == 0 ?
-            getString("_UI_SelectDescription_type") :
-            getString("_UI_SelectDescription_type") + " " + label;
+        String label = ((SelectDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_SelectDescription_type") : getString("_UI_SelectDescription_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 -->
+     * 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
@@ -199,33 +169,30 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
         updateChildren(notification);
 
         switch (notification.getFeatureID(SelectDescription.class)) {
-            case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
+        case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
+        case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        case PropertiesPackage.SELECT_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 -->
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add
-            (createChildParameter
-                (PropertiesPackage.Literals.SELECT_DESCRIPTION__INITIAL_OPERATION,
-                 ToolFactory.eINSTANCE.createInitialOperation()));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.SELECT_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
     }
 
 }
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 afbd647760..fec8a0b65e 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
@@ -11,36 +11,32 @@
  */
 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.TextDescription;
-
 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 -->
+ * 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 -->
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public TextDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -48,9 +44,9 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     }
 
     /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -64,33 +60,25 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     }
 
     /**
-     * This adds a property descriptor for the Value Expression feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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_TextDescription_valueExpression_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_TextDescription_valueExpression_feature", "_UI_TextDescription_type"),
-                 PropertiesPackage.Literals.TEXT_DESCRIPTION__VALUE_EXPRESSION,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_TextDescription_valueExpression_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TextDescription_valueExpression_feature", "_UI_TextDescription_type"),
+                PropertiesPackage.Literals.TEXT_DESCRIPTION__VALUE_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 -->
+     * 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
@@ -103,22 +91,23 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- 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
+        // 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 TextDescription.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns TextDescription.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -127,25 +116,23 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
     }
 
     /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((TextDescription)object).getIdentifier();
-        return label == null || label.length() == 0 ?
-            getString("_UI_TextDescription_type") :
-            getString("_UI_TextDescription_type") + " " + label;
+        String label = ((TextDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_TextDescription_type") : getString("_UI_TextDescription_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 -->
+     * 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
@@ -153,31 +140,28 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
         updateChildren(notification);
 
         switch (notification.getFeatureID(TextDescription.class)) {
-            case PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        case PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        case PropertiesPackage.TEXT_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 -->
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+     * describing the children that can be created under this object. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add
-            (createChildParameter
-                (PropertiesPackage.Literals.TEXT_DESCRIPTION__INITIAL_OPERATION,
-                 ToolFactory.eINSTANCE.createInitialOperation()));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.TEXT_DESCRIPTION__INITIAL_OPERATION, ToolFactory.eINSTANCE.createInitialOperation()));
     }
 
 }
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 c5ad842790..bff3b18b03 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
@@ -11,17 +11,13 @@
  */
 package org.eclipse.sirius.properties.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -32,29 +28,23 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.sirius.properties.PropertiesFactory;
 import org.eclipse.sirius.properties.PropertiesPackage;
 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 -->
+ * 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,
+public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
         IItemPropertySource {
     /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public ViewExtensionDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +52,9 @@ public class ViewExtensionDescriptionItemProvider
     }
 
     /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -81,99 +71,65 @@ public class ViewExtensionDescriptionItemProvider
     }
 
     /**
-     * This adds a property descriptor for the Identifier feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Identifier feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ViewExtensionDescription_identifier_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_identifier_feature", "_UI_ViewExtensionDescription_type"),
-                 PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_ViewExtensionDescription_identifier_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_identifier_feature", "_UI_ViewExtensionDescription_type"),
+                PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
-     * This adds a property descriptor for the Metamodels feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Metamodels feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addMetamodelsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ViewExtensionDescription_metamodels_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_metamodels_feature", "_UI_ViewExtensionDescription_type"),
-                 PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__METAMODELS,
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_ViewExtensionDescription_metamodels_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_metamodels_feature", "_UI_ViewExtensionDescription_type"),
+                PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__METAMODELS, true, false, true, null, null, null));
     }
 
     /**
-     * This adds a property descriptor for the Default Page feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Default Page feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addDefaultPagePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ViewExtensionDescription_defaultPage_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_defaultPage_feature", "_UI_ViewExtensionDescription_type"),
-                 PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE,
-                 true,
-                 false,
-                 true,
-                 null,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_ViewExtensionDescription_defaultPage_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_defaultPage_feature", "_UI_ViewExtensionDescription_type"),
+                PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE, true, false, true, null, null, null));
     }
 
     /**
-     * This adds a property descriptor for the Label Expression feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Label Expression feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_ViewExtensionDescription_labelExpression_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_labelExpression_feature", "_UI_ViewExtensionDescription_type"),
-                 PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_ViewExtensionDescription_labelExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_ViewExtensionDescription_labelExpression_feature", "_UI_ViewExtensionDescription_type"),
+                PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__LABEL_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 -->
+     * 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
@@ -187,22 +143,23 @@ public class ViewExtensionDescriptionItemProvider
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- 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
+        // 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 ViewExtensionDescription.gif.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns ViewExtensionDescription.gif. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -211,25 +168,23 @@ public class ViewExtensionDescriptionItemProvider
     }
 
     /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((ViewExtensionDescription)object).getIdentifier();
-        return label == null || label.length() == 0 ?
-            getString("_UI_ViewExtensionDescription_type") :
-            getString("_UI_ViewExtensionDescription_type") + " " + label;
+        String label = ((ViewExtensionDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_ViewExtensionDescription_type") : getString("_UI_ViewExtensionDescription_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 -->
+     * 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
@@ -237,44 +192,38 @@ public class ViewExtensionDescriptionItemProvider
         updateChildren(notification);
 
         switch (notification.getFeatureID(ViewExtensionDescription.class)) {
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER:
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-                return;
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER:
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
+            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 -->
+     * 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.VIEW_EXTENSION_DESCRIPTION__PAGES,
-                 PropertiesFactory.eINSTANCE.createPageDescription()));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__PAGES, PropertiesFactory.eINSTANCE.createPageDescription()));
 
-        newChildDescriptors.add
-            (createChildParameter
-                (PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__GROUPS,
-                 PropertiesFactory.eINSTANCE.createGroupDescription()));
+        newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__GROUPS, PropertiesFactory.eINSTANCE.createGroupDescription()));
     }
 
     /**
-     * Return the resource locator for this item provider's resources.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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 29e7d4345b..a5b3980ba2 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
@@ -11,15 +11,12 @@
  */
 package org.eclipse.sirius.properties.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -30,28 +27,22 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.WidgetDescription;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.sirius.properties.WidgetDescription} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * 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,
+public class WidgetDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
         IItemPropertySource {
     /**
-     * This constructs an instance from a factory and a notifier.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This constructs an instance from a factory and a notifier. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public WidgetDescriptionItemProvider(AdapterFactory adapterFactory) {
@@ -59,9 +50,9 @@ public class WidgetDescriptionItemProvider
     }
 
     /**
-     * This returns the property descriptors for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the property descriptors for the adapted class. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -76,69 +67,48 @@ public class WidgetDescriptionItemProvider
     }
 
     /**
-     * This adds a property descriptor for the Identifier feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Identifier feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addIdentifierPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_WidgetDescription_identifier_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_identifier_feature", "_UI_WidgetDescription_type"),
-                 PropertiesPackage.Literals.WIDGET_DESCRIPTION__IDENTIFIER,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_WidgetDescription_identifier_feature"), getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_identifier_feature", "_UI_WidgetDescription_type"),
+                PropertiesPackage.Literals.WIDGET_DESCRIPTION__IDENTIFIER, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
-     * This adds a property descriptor for the Label Expression feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This adds a property descriptor for the Label Expression feature. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected void addLabelExpressionPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add
-            (createItemPropertyDescriptor
-                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-                 getResourceLocator(),
-                 getString("_UI_WidgetDescription_labelExpression_feature"),
-                 getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_labelExpression_feature", "_UI_WidgetDescription_type"),
-                 PropertiesPackage.Literals.WIDGET_DESCRIPTION__LABEL_EXPRESSION,
-                 true,
-                 false,
-                 false,
-                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                 null,
-                 null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_WidgetDescription_labelExpression_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_labelExpression_feature", "_UI_WidgetDescription_type"),
+                PropertiesPackage.Literals.WIDGET_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
     }
 
     /**
-     * This returns the label text for the adapted class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((WidgetDescription)object).getIdentifier();
-        return label == null || label.length() == 0 ?
-            getString("_UI_WidgetDescription_type") :
-            getString("_UI_WidgetDescription_type") + " " + label;
+        String label = ((WidgetDescription) object).getIdentifier();
+        return label == null || label.length() == 0 ? getString("_UI_WidgetDescription_type") : getString("_UI_WidgetDescription_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 -->
+     * 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
@@ -146,19 +116,19 @@ public class WidgetDescriptionItemProvider
         updateChildren(notification);
 
         switch (notification.getFeatureID(WidgetDescription.class)) {
-            case PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER:
-            case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
-                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-                return;
+        case PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER:
+        case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
+            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+            return;
         }
         super.notifyChanged(notification);
     }
 
     /**
-     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-     * that can be created under this object.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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
@@ -167,9 +137,9 @@ public class WidgetDescriptionItemProvider
     }
 
     /**
-     * Return the resource locator for this item provider's resources.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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 4c5b227347..90ee577133 100644
--- a/incubation/org.eclipse.sirius.properties/model/properties.ecore
+++ b/incubation/org.eclipse.sirius.properties/model/properties.ecore
@@ -53,6 +53,13 @@
         eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/InitialOperation"
         containment="true"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ButtonDescription" eSuperTypes="#//WidgetDescription">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="buttonLabelExpression"
+        eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="initialOperation" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/InitialOperation"
+        containment="true"/>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="LabelDescription" eSuperTypes="#//WidgetDescription"/>
   <eClassifiers xsi:type="ecore:EClass" name="CheckboxDescription" eSuperTypes="#//WidgetDescription">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="valueExpression" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"/>
diff --git a/incubation/org.eclipse.sirius.properties/model/properties.genmodel b/incubation/org.eclipse.sirius.properties/model/properties.genmodel
index 0238dbebe7..86a6fedfd2 100644
--- a/incubation/org.eclipse.sirius.properties/model/properties.genmodel
+++ b/incubation/org.eclipse.sirius.properties/model/properties.genmodel
@@ -1,6 +1,6 @@
 <?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) 2015 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;"
+    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"
@@ -46,7 +46,21 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//TextDescription/valueExpression"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//TextDescription/initialOperation"/>
     </genClasses>
+    <genClasses ecoreClass="properties.ecore#//ButtonDescription">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//ButtonDescription/buttonLabelExpression"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//ButtonDescription/initialOperation"/>
+    </genClasses>
     <genClasses ecoreClass="properties.ecore#//LabelDescription"/>
+    <genClasses ecoreClass="properties.ecore#//CheckboxDescription">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//CheckboxDescription/valueExpression"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//CheckboxDescription/initialOperation"/>
+    </genClasses>
+    <genClasses ecoreClass="properties.ecore#//SelectDescription">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/valueExpression"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//SelectDescription/initialOperation"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/candidatesExpression"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/candidateDisplayExpression"/>
+    </genClasses>
     <genClasses ecoreClass="properties.ecore#//DynamicMappingFor">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//DynamicMappingFor/iterator"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//DynamicMappingFor/domainClassExpression"/>
@@ -60,11 +74,5 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//DynamicMappingCase/caseExpression"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//DynamicMappingCase/widget"/>
     </genClasses>
-    <genClasses ecoreClass="properties.ecore#//SelectDescription">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/valueExpression"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference properties.ecore#//SelectDescription/initialOperation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/candidatesExpression"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute properties.ecore#//SelectDescription/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
new file mode 100644
index 0000000000..3f3135d6ea
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/ButtonDescription.java
@@ -0,0 +1,101 @@
+/**
+ * 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>Button Description</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.ButtonDescription#getButtonLabelExpression
+ * <em>Button Label Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.ButtonDescription#getInitialOperation
+ * <em>Initial Operation</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.sirius.properties.PropertiesPackage#getButtonDescription()
+ * @model
+ * @generated
+ */
+public interface ButtonDescription extends WidgetDescription {
+    /**
+     * Returns the value of the '<em><b>Button Label Expression</b></em>'
+     * attribute. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Button Label Expression</em>' attribute isn't
+     * clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * 
+     * @return the value of the '<em>Button Label Expression</em>' attribute.
+     * @see #setButtonLabelExpression(String)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getButtonDescription_ButtonLabelExpression()
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @generated
+     */
+    String getButtonLabelExpression();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.ButtonDescription#getButtonLabelExpression
+     * <em>Button Label Expression</em>}' attribute. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Button Label Expression</em>'
+     *            attribute.
+     * @see #getButtonLabelExpression()
+     * @generated
+     */
+    void setButtonLabelExpression(String value);
+
+    /**
+     * Returns the value of the '<em><b>Initial Operation</b></em>' containment
+     * reference. <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Initial Operation</em>' containment reference
+     * isn't clear, there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * 
+     * @return the value of the '<em>Initial Operation</em>' containment
+     *         reference.
+     * @see #setInitialOperation(InitialOperation)
+     * @see org.eclipse.sirius.properties.PropertiesPackage#getButtonDescription_InitialOperation()
+     * @model containment="true" required="true"
+     * @generated
+     */
+    InitialOperation getInitialOperation();
+
+    /**
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.ButtonDescription#getInitialOperation
+     * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Initial Operation</em>' containment
+     *            reference.
+     * @see #getInitialOperation()
+     * @generated
+     */
+    void setInitialOperation(InitialOperation value);
+
+} // ButtonDescription
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 4d8a100b8a..b9e72f9a65 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
@@ -14,15 +14,18 @@ package org.eclipse.sirius.properties;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Checkbox Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Checkbox Description</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.CheckboxDescription#getValueExpression <em>Value Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.CheckboxDescription#getInitialOperation <em>Initial Operation</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.CheckboxDescription#getValueExpression
+ * <em>Value Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.CheckboxDescription#getInitialOperation
+ * <em>Initial Operation</em>}</li>
  * </ul>
  * </p>
  *
@@ -39,33 +42,40 @@ public interface CheckboxDescription extends WidgetDescription {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>Value Expression</em>' attribute.
      * @see #setValueExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getCheckboxDescription_ValueExpression()
-     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getValueExpression();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.CheckboxDescription#getValueExpression <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Value Expression</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.CheckboxDescription#getValueExpression
+     * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Value Expression</em>' attribute.
      * @see #getValueExpression()
      * @generated
      */
     void setValueExpression(String value);
 
     /**
-     * Returns the value of the '<em><b>Initial Operation</b></em>' containment reference.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Initial Operation</b></em>' containment
+     * reference. <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Initial Operation</em>' containment reference isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Initial Operation</em>' containment reference
+     * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * @return the value of the '<em>Initial Operation</em>' containment reference.
+     * 
+     * @return the value of the '<em>Initial Operation</em>' containment
+     *         reference.
      * @see #setInitialOperation(InitialOperation)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getCheckboxDescription_InitialOperation()
      * @model containment="true" required="true"
@@ -74,10 +84,14 @@ public interface CheckboxDescription extends WidgetDescription {
     InitialOperation getInitialOperation();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.CheckboxDescription#getInitialOperation <em>Initial Operation</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Initial Operation</em>' containment reference.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.CheckboxDescription#getInitialOperation
+     * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Initial Operation</em>' containment
+     *            reference.
      * @see #getInitialOperation()
      * @generated
      */
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 7489008e88..9436c399e3 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
@@ -12,20 +12,22 @@
 package org.eclipse.sirius.properties;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Container Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Container Description</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.ContainerDescription#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.ContainerDescription#getWidgets <em>Widgets</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.ContainerDescription#getDynamicMappings <em>Dynamic Mappings</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.ContainerDescription#getIdentifier
+ * <em>Identifier</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.ContainerDescription#getWidgets <em>
+ * Widgets</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.ContainerDescription#getDynamicMappings
+ * <em>Dynamic Mappings</em>}</li>
  * </ul>
  * </p>
  *
@@ -35,13 +37,14 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface ContainerDescription extends EObject {
     /**
-     * Returns the value of the '<em><b>Identifier</b></em>' attribute.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!--
+     * begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there
+     * 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()
@@ -51,24 +54,29 @@ public interface ContainerDescription extends EObject {
     String getIdentifier();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.ContainerDescription#getIdentifier <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Identifier</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.ContainerDescription#getIdentifier
+     * <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
      * @generated
      */
     void setIdentifier(String value);
 
     /**
-     * Returns the value of the '<em><b>Widgets</b></em>' containment reference list.
-     * The list contents are of type {@link org.eclipse.sirius.properties.WidgetDescription}.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Widgets</b></em>' containment reference
+     * list. The list contents are of type
+     * {@link org.eclipse.sirius.properties.WidgetDescription}. <!--
+     * begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Widgets</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Widgets</em>' containment reference list isn't
+     * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>Widgets</em>' containment reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getContainerDescription_Widgets()
      * @model containment="true"
@@ -77,15 +85,18 @@ public interface ContainerDescription extends EObject {
     EList<WidgetDescription> getWidgets();
 
     /**
-     * Returns the value of the '<em><b>Dynamic Mappings</b></em>' containment reference list.
-     * The list contents are of type {@link org.eclipse.sirius.properties.DynamicMappingFor}.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Dynamic Mappings</b></em>' containment
+     * reference list. The list contents are of type
+     * {@link org.eclipse.sirius.properties.DynamicMappingFor}. <!--
+     * begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Dynamic Mappings</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Dynamic Mappings</em>' containment reference
+     * list isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * @return the value of the '<em>Dynamic Mappings</em>' containment reference list.
+     * 
+     * @return the value of the '<em>Dynamic Mappings</em>' containment
+     *         reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getContainerDescription_DynamicMappings()
      * @model containment="true"
      * @generated
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 43aa0ebe60..4340e91b5b 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
@@ -14,15 +14,17 @@ package org.eclipse.sirius.properties;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dynamic Mapping Case</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Dynamic Mapping Case</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.DynamicMappingCase#getCaseExpression <em>Case Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.DynamicMappingCase#getWidget <em>Widget</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.DynamicMappingCase#getCaseExpression
+ * <em>Case Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.DynamicMappingCase#getWidget <em>
+ * Widget</em>}</li>
  * </ul>
  * </p>
  *
@@ -39,6 +41,7 @@ public interface DynamicMappingCase extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>Case Expression</em>' attribute.
      * @see #setCaseExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getDynamicMappingCase_CaseExpression()
@@ -48,10 +51,13 @@ public interface DynamicMappingCase extends EObject {
     String getCaseExpression();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.DynamicMappingCase#getCaseExpression <em>Case Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Case Expression</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.DynamicMappingCase#getCaseExpression
+     * <em>Case Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Case Expression</em>' attribute.
      * @see #getCaseExpression()
      * @generated
      */
@@ -61,10 +67,11 @@ public interface DynamicMappingCase extends EObject {
      * Returns the value of the '<em><b>Widget</b></em>' containment reference.
      * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Widget</em>' containment reference isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Widget</em>' containment reference isn't
+     * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>Widget</em>' containment reference.
      * @see #setWidget(WidgetDescription)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getDynamicMappingCase_Widget()
@@ -74,10 +81,13 @@ public interface DynamicMappingCase extends EObject {
     WidgetDescription getWidget();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.DynamicMappingCase#getWidget <em>Widget</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Widget</em>' containment reference.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.DynamicMappingCase#getWidget
+     * <em>Widget</em>}' containment reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Widget</em>' containment reference.
      * @see #getWidget()
      * @generated
      */
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 1fb543701e..ee8386fa90 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
@@ -14,16 +14,19 @@ package org.eclipse.sirius.properties;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dynamic Mapping For</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Dynamic Mapping For</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.DynamicMappingFor#getIterator <em>Iterator</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression <em>Domain Class Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.DynamicMappingFor#getSwitch <em>Switch</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.DynamicMappingFor#getIterator <em>
+ * Iterator</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression
+ * <em>Domain Class Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.DynamicMappingFor#getSwitch <em>
+ * Switch</em>}</li>
  * </ul>
  * </p>
  *
@@ -33,13 +36,14 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface DynamicMappingFor extends EObject {
     /**
-     * Returns the value of the '<em><b>Iterator</b></em>' attribute.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Iterator</b></em>' attribute. <!--
+     * begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Iterator</em>' attribute isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Iterator</em>' attribute isn't clear, there
+     * 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()
@@ -49,23 +53,27 @@ public interface DynamicMappingFor extends EObject {
     String getIterator();
 
     /**
-     * Sets the value of the '{@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.
+     * Sets the value of the '
+     * {@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()
      * @generated
      */
     void setIterator(String value);
 
     /**
-     * Returns the value of the '<em><b>Domain Class Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Domain Class Expression</b></em>'
+     * attribute. <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Domain Class Expression</em>' attribute isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Domain Class Expression</em>' attribute isn't
+     * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>Domain Class Expression</em>' attribute.
      * @see #setDomainClassExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getDynamicMappingFor_DomainClassExpression()
@@ -75,10 +83,14 @@ public interface DynamicMappingFor extends EObject {
     String getDomainClassExpression();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression <em>Domain Class Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression
+     * <em>Domain Class Expression</em>}' attribute. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Domain Class Expression</em>' attribute.
+     * 
+     * @param value
+     *            the new value of the '<em>Domain Class Expression</em>'
+     *            attribute.
      * @see #getDomainClassExpression()
      * @generated
      */
@@ -88,10 +100,11 @@ public interface DynamicMappingFor extends EObject {
      * Returns the value of the '<em><b>Switch</b></em>' containment reference.
      * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Switch</em>' containment reference isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Switch</em>' containment reference isn't
+     * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>Switch</em>' containment reference.
      * @see #setSwitch(DynamicMappingSwitch)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getDynamicMappingFor_Switch()
@@ -101,10 +114,13 @@ public interface DynamicMappingFor extends EObject {
     DynamicMappingSwitch getSwitch();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.DynamicMappingFor#getSwitch <em>Switch</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Switch</em>' containment reference.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.DynamicMappingFor#getSwitch
+     * <em>Switch</em>}' containment reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Switch</em>' containment reference.
      * @see #getSwitch()
      * @generated
      */
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 80d848176a..f2fa759e5f 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
@@ -12,19 +12,20 @@
 package org.eclipse.sirius.properties;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dynamic Mapping Switch</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Dynamic Mapping Switch</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.DynamicMappingSwitch#getSwitchExpression <em>Switch Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.DynamicMappingSwitch#getCases <em>Cases</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.DynamicMappingSwitch#getSwitchExpression
+ * <em>Switch Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.DynamicMappingSwitch#getCases <em>
+ * Cases</em>}</li>
  * </ul>
  * </p>
  *
@@ -41,6 +42,7 @@ public interface DynamicMappingSwitch extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>Switch Expression</em>' attribute.
      * @see #setSwitchExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getDynamicMappingSwitch_SwitchExpression()
@@ -50,24 +52,29 @@ public interface DynamicMappingSwitch extends EObject {
     String getSwitchExpression();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.DynamicMappingSwitch#getSwitchExpression <em>Switch Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Switch Expression</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.DynamicMappingSwitch#getSwitchExpression
+     * <em>Switch Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Switch Expression</em>' attribute.
      * @see #getSwitchExpression()
      * @generated
      */
     void setSwitchExpression(String value);
 
     /**
-     * Returns the value of the '<em><b>Cases</b></em>' containment reference list.
-     * The list contents are of type {@link org.eclipse.sirius.properties.DynamicMappingCase}.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Cases</b></em>' containment reference
+     * list. The list contents are of type
+     * {@link org.eclipse.sirius.properties.DynamicMappingCase}. <!--
+     * begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Cases</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Cases</em>' containment reference list isn't
+     * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>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 c01c16a8ee..3bb4600a91 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
@@ -14,18 +14,23 @@ package org.eclipse.sirius.properties;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Group Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Group Description</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.GroupDescription#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.GroupDescription#getLabelExpression <em>Label Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.GroupDescription#getDomainClass <em>Domain Class</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.GroupDescription#getSemanticCandidateExpression <em>Semantic Candidate Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.GroupDescription#getContainer <em>Container</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.GroupDescription#getIdentifier <em>
+ * Identifier</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.GroupDescription#getLabelExpression
+ * <em>Label Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.GroupDescription#getDomainClass <em>
+ * Domain Class</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.GroupDescription#getSemanticCandidateExpression
+ * <em>Semantic Candidate Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.GroupDescription#getContainer <em>
+ * Container</em>}</li>
  * </ul>
  * </p>
  *
@@ -35,13 +40,14 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface GroupDescription extends EObject {
     /**
-     * Returns the value of the '<em><b>Identifier</b></em>' attribute.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!--
+     * begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there
+     * 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()
@@ -51,10 +57,13 @@ public interface GroupDescription extends EObject {
     String getIdentifier();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.GroupDescription#getIdentifier <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Identifier</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.GroupDescription#getIdentifier
+     * <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
      * @generated
      */
@@ -68,32 +77,38 @@ public interface GroupDescription extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>Label Expression</em>' attribute.
      * @see #setLabelExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupDescription_LabelExpression()
-     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getLabelExpression();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.GroupDescription#getLabelExpression <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Label Expression</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.GroupDescription#getLabelExpression
+     * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Label Expression</em>' attribute.
      * @see #getLabelExpression()
      * @generated
      */
     void setLabelExpression(String value);
 
     /**
-     * Returns the value of the '<em><b>Domain Class</b></em>' attribute.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Domain Class</b></em>' attribute. <!--
+     * begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Domain Class</em>' attribute isn't clear,
      * 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()
@@ -103,49 +118,60 @@ public interface GroupDescription extends EObject {
     String getDomainClass();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.GroupDescription#getDomainClass <em>Domain Class</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Domain Class</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.GroupDescription#getDomainClass
+     * <em>Domain Class</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Domain Class</em>' attribute.
      * @see #getDomainClass()
      * @generated
      */
     void setDomainClass(String value);
 
     /**
-     * Returns the value of the '<em><b>Semantic Candidate Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Semantic Candidate Expression</b></em>'
+     * attribute. <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Semantic Candidate Expression</em>' attribute isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Semantic Candidate Expression</em>' attribute
+     * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * @return the value of the '<em>Semantic Candidate Expression</em>' attribute.
+     * 
+     * @return the value of the '<em>Semantic Candidate Expression</em>'
+     *         attribute.
      * @see #setSemanticCandidateExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupDescription_SemanticCandidateExpression()
-     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getSemanticCandidateExpression();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.GroupDescription#getSemanticCandidateExpression <em>Semantic Candidate Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Semantic Candidate Expression</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.GroupDescription#getSemanticCandidateExpression
+     * <em>Semantic Candidate Expression</em>}' attribute. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Semantic Candidate Expression</em>'
+     *            attribute.
      * @see #getSemanticCandidateExpression()
      * @generated
      */
     void setSemanticCandidateExpression(String value);
 
     /**
-     * Returns the value of the '<em><b>Container</b></em>' containment reference.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Container</b></em>' containment
+     * reference. <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Container</em>' containment reference isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Container</em>' containment reference isn't
+     * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>Container</em>' containment reference.
      * @see #setContainer(ContainerDescription)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupDescription_Container()
@@ -155,10 +181,14 @@ public interface GroupDescription extends EObject {
     ContainerDescription getContainer();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.GroupDescription#getContainer <em>Container</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Container</em>' containment reference.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.GroupDescription#getContainer
+     * <em>Container</em>}' containment reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Container</em>' containment
+     *            reference.
      * @see #getContainer()
      * @generated
      */
diff --git a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelDescription.java b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelDescription.java
index e239533e0c..97bb49d04c 100644
--- a/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelDescription.java
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/LabelDescription.java
@@ -11,11 +11,9 @@
  */
 package org.eclipse.sirius.properties;
 
-
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Label Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Label Description</b></em>'. <!-- end-user-doc -->
  *
  *
  * @see org.eclipse.sirius.properties.PropertiesPackage#getLabelDescription()
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 e3de7b1357..64539849d9 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
@@ -12,22 +12,26 @@
 package org.eclipse.sirius.properties;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Page Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Page Description</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.PageDescription#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.PageDescription#getLabelExpression <em>Label Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.PageDescription#getDomainClass <em>Domain Class</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.PageDescription#getSemanticCandidateExpression <em>Semantic Candidate Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.PageDescription#getGroups <em>Groups</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.PageDescription#getIdentifier <em>
+ * Identifier</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.PageDescription#getLabelExpression
+ * <em>Label Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.PageDescription#getDomainClass <em>
+ * Domain Class</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.PageDescription#getSemanticCandidateExpression
+ * <em>Semantic Candidate Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.PageDescription#getGroups <em>Groups
+ * </em>}</li>
  * </ul>
  * </p>
  *
@@ -37,13 +41,14 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface PageDescription extends EObject {
     /**
-     * Returns the value of the '<em><b>Identifier</b></em>' attribute.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!--
+     * begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there
+     * 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()
@@ -53,10 +58,13 @@ public interface PageDescription extends EObject {
     String getIdentifier();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.PageDescription#getIdentifier <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Identifier</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.PageDescription#getIdentifier
+     * <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
      * @generated
      */
@@ -70,32 +78,38 @@ public interface PageDescription extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>Label Expression</em>' attribute.
      * @see #setLabelExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getPageDescription_LabelExpression()
-     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getLabelExpression();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.PageDescription#getLabelExpression <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Label Expression</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.PageDescription#getLabelExpression
+     * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Label Expression</em>' attribute.
      * @see #getLabelExpression()
      * @generated
      */
     void setLabelExpression(String value);
 
     /**
-     * Returns the value of the '<em><b>Domain Class</b></em>' attribute.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Domain Class</b></em>' attribute. <!--
+     * begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Domain Class</em>' attribute isn't clear,
      * 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()
@@ -105,50 +119,62 @@ public interface PageDescription extends EObject {
     String getDomainClass();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.PageDescription#getDomainClass <em>Domain Class</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Domain Class</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.PageDescription#getDomainClass
+     * <em>Domain Class</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Domain Class</em>' attribute.
      * @see #getDomainClass()
      * @generated
      */
     void setDomainClass(String value);
 
     /**
-     * Returns the value of the '<em><b>Semantic Candidate Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Semantic Candidate Expression</b></em>'
+     * attribute. <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Semantic Candidate Expression</em>' attribute isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Semantic Candidate Expression</em>' attribute
+     * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * @return the value of the '<em>Semantic Candidate Expression</em>' attribute.
+     * 
+     * @return the value of the '<em>Semantic Candidate Expression</em>'
+     *         attribute.
      * @see #setSemanticCandidateExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getPageDescription_SemanticCandidateExpression()
-     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getSemanticCandidateExpression();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.PageDescription#getSemanticCandidateExpression <em>Semantic Candidate Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Semantic Candidate Expression</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.PageDescription#getSemanticCandidateExpression
+     * <em>Semantic Candidate Expression</em>}' attribute. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Semantic Candidate Expression</em>'
+     *            attribute.
      * @see #getSemanticCandidateExpression()
      * @generated
      */
     void setSemanticCandidateExpression(String value);
 
     /**
-     * Returns the value of the '<em><b>Groups</b></em>' reference list.
-     * The list contents are of type {@link org.eclipse.sirius.properties.GroupDescription}.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Groups</b></em>' reference list. The
+     * list contents are of type
+     * {@link org.eclipse.sirius.properties.GroupDescription}. <!--
+     * begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Groups</em>' reference list isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Groups</em>' reference list isn't clear, there
+     * 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 6353ce578a..2aa8f02685 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
@@ -14,128 +14,136 @@ package org.eclipse.sirius.properties;
 import org.eclipse.emf.ecore.EFactory;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
+ * create method for each non-abstract class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.sirius.properties.PropertiesPackage
  * @generated
  */
 public interface PropertiesFactory extends EFactory {
     /**
-     * The singleton instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The singleton instance of the factory. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     PropertiesFactory eINSTANCE = org.eclipse.sirius.properties.impl.PropertiesFactoryImpl.init();
 
     /**
-     * Returns a new object of class '<em>View Extension Description</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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
      */
     ViewExtensionDescription createViewExtensionDescription();
 
     /**
-     * Returns a new object of class '<em>Page Description</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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
      */
     PageDescription createPageDescription();
 
     /**
-     * Returns a new object of class '<em>Group Description</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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
      */
     GroupDescription createGroupDescription();
 
     /**
-     * Returns a new object of class '<em>Container Description</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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
      */
     ContainerDescription createContainerDescription();
 
     /**
-     * Returns a new object of class '<em>Text Description</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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
      */
     TextDescription createTextDescription();
 
     /**
-     * Returns a new object of class '<em>Label Description</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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
+     */
+    ButtonDescription createButtonDescription();
+
+    /**
+     * 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
      */
     LabelDescription createLabelDescription();
 
     /**
-     * Returns a new object of class '<em>Checkbox Description</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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
      */
     CheckboxDescription createCheckboxDescription();
 
     /**
-     * Returns a new object of class '<em>Select Description</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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
      */
     SelectDescription createSelectDescription();
 
     /**
-     * Returns a new object of class '<em>Dynamic Mapping For</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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
      */
     DynamicMappingFor createDynamicMappingFor();
 
     /**
-     * Returns a new object of class '<em>Dynamic Mapping Switch</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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
      */
     DynamicMappingSwitch createDynamicMappingSwitch();
 
     /**
-     * Returns a new object of class '<em>Dynamic Mapping Case</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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
      */
     DynamicMappingCase createDynamicMappingCase();
 
     /**
-     * Returns the package supported by this factory.
-     * <!-- begin-user-doc -->
+     * Returns the package supported by this factory. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @return the package supported by this factory.
      * @generated
      */
     PropertiesPackage getPropertiesPackage();
 
-} //PropertiesFactory
+} // PropertiesFactory
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 e5db175b70..fbecfbfce3 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
@@ -15,61 +15,59 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
+ * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains
+ * accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.sirius.properties.PropertiesFactory
  * @model kind="package"
  * @generated
  */
 public interface PropertiesPackage extends EPackage {
     /**
-     * The package name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     String eNAME = "properties";
 
     /**
-     * The package namespace URI.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     String eNS_URI = "http://www.eclipse.org/sirius/properties/1.0.0";
 
     /**
-     * The package namespace name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     String eNS_PREFIX = "properties";
 
     /**
-     * The singleton instance of the package.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The singleton instance of the package. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     PropertiesPackage eINSTANCE = org.eclipse.sirius.properties.impl.PropertiesPackageImpl.init();
 
     /**
-     * The meta object id for the '{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl <em>View Extension Description</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl
+     * <em>View Extension Description</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getViewExtensionDescription()
      * @generated
@@ -77,72 +75,75 @@ public interface PropertiesPackage extends EPackage {
     int VIEW_EXTENSION_DESCRIPTION = 0;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int VIEW_EXTENSION_DESCRIPTION__IDENTIFIER = DescriptionPackage.EXTENSION_FEATURE_COUNT + 0;
 
     /**
-     * The feature id for the '<em><b>Metamodels</b></em>' reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Metamodels</b></em>' reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int VIEW_EXTENSION_DESCRIPTION__METAMODELS = DescriptionPackage.EXTENSION_FEATURE_COUNT + 1;
 
     /**
-     * The feature id for the '<em><b>Pages</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Pages</b></em>' containment reference
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int VIEW_EXTENSION_DESCRIPTION__PAGES = DescriptionPackage.EXTENSION_FEATURE_COUNT + 2;
 
     /**
-     * The feature id for the '<em><b>Default Page</b></em>' reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Default Page</b></em>' reference. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE = DescriptionPackage.EXTENSION_FEATURE_COUNT + 3;
 
     /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION = DescriptionPackage.EXTENSION_FEATURE_COUNT + 4;
 
     /**
-     * The feature id for the '<em><b>Groups</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Groups</b></em>' containment reference
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int VIEW_EXTENSION_DESCRIPTION__GROUPS = DescriptionPackage.EXTENSION_FEATURE_COUNT + 5;
 
     /**
-     * The number of structural features of the '<em>View Extension Description</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The number of structural features of the '
+     * <em>View Extension Description</em>' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int VIEW_EXTENSION_DESCRIPTION_FEATURE_COUNT = DescriptionPackage.EXTENSION_FEATURE_COUNT + 6;
 
     /**
-     * The meta object id for the '{@link org.eclipse.sirius.properties.impl.PageDescriptionImpl <em>Page Description</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.PageDescriptionImpl
+     * <em>Page Description</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see org.eclipse.sirius.properties.impl.PageDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getPageDescription()
      * @generated
@@ -150,63 +151,65 @@ public interface PropertiesPackage extends EPackage {
     int PAGE_DESCRIPTION = 1;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int PAGE_DESCRIPTION__IDENTIFIER = 0;
 
     /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int PAGE_DESCRIPTION__LABEL_EXPRESSION = 1;
 
     /**
-     * The feature id for the '<em><b>Domain Class</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Domain Class</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int PAGE_DESCRIPTION__DOMAIN_CLASS = 2;
 
     /**
-     * The feature id for the '<em><b>Semantic Candidate Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Semantic Candidate Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION = 3;
 
     /**
-     * The feature id for the '<em><b>Groups</b></em>' reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Groups</b></em>' reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int PAGE_DESCRIPTION__GROUPS = 4;
 
     /**
-     * The number of structural features of the '<em>Page Description</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The number of structural features of the '<em>Page Description</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int PAGE_DESCRIPTION_FEATURE_COUNT = 5;
 
     /**
-     * The meta object id for the '{@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl <em>Group Description</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl
+     * <em>Group Description</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see org.eclipse.sirius.properties.impl.GroupDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getGroupDescription()
      * @generated
@@ -214,36 +217,36 @@ public interface PropertiesPackage extends EPackage {
     int GROUP_DESCRIPTION = 2;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int GROUP_DESCRIPTION__IDENTIFIER = 0;
 
     /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int GROUP_DESCRIPTION__LABEL_EXPRESSION = 1;
 
     /**
-     * The feature id for the '<em><b>Domain Class</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Domain Class</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int GROUP_DESCRIPTION__DOMAIN_CLASS = 2;
 
     /**
-     * The feature id for the '<em><b>Semantic Candidate Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Semantic Candidate Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
@@ -251,26 +254,28 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The feature id for the '<em><b>Container</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int GROUP_DESCRIPTION__CONTAINER = 4;
 
     /**
-     * The number of structural features of the '<em>Group Description</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The number of structural features of the '<em>Group Description</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int GROUP_DESCRIPTION_FEATURE_COUNT = 5;
 
     /**
-     * The meta object id for the '{@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl <em>Container Description</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl
+     * <em>Container Description</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see org.eclipse.sirius.properties.impl.ContainerDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getContainerDescription()
      * @generated
@@ -278,45 +283,47 @@ public interface PropertiesPackage extends EPackage {
     int CONTAINER_DESCRIPTION = 3;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int CONTAINER_DESCRIPTION__IDENTIFIER = 0;
 
     /**
-     * The feature id for the '<em><b>Widgets</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Widgets</b></em>' containment reference
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int CONTAINER_DESCRIPTION__WIDGETS = 1;
 
     /**
-     * The feature id for the '<em><b>Dynamic Mappings</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Dynamic Mappings</b></em>' containment
+     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS = 2;
 
     /**
-     * The number of structural features of the '<em>Container Description</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The number of structural features of the '<em>Container Description</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int CONTAINER_DESCRIPTION_FEATURE_COUNT = 3;
 
     /**
-     * The meta object id for the '{@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl <em>Widget Description</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl
+     * <em>Widget Description</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see org.eclipse.sirius.properties.impl.WidgetDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getWidgetDescription()
      * @generated
@@ -324,36 +331,38 @@ public interface PropertiesPackage extends EPackage {
     int WIDGET_DESCRIPTION = 4;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Identifier</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int WIDGET_DESCRIPTION__IDENTIFIER = 0;
 
     /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Label Expression</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int WIDGET_DESCRIPTION__LABEL_EXPRESSION = 1;
 
     /**
-     * The number of structural features of the '<em>Widget Description</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The number of structural features of the '<em>Widget Description</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int WIDGET_DESCRIPTION_FEATURE_COUNT = 2;
 
     /**
-     * The meta object id for the '{@link org.eclipse.sirius.properties.impl.TextDescriptionImpl <em>Text Description</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.TextDescriptionImpl
+     * <em>Text Description</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see org.eclipse.sirius.properties.impl.TextDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextDescription()
      * @generated
@@ -361,183 +370,246 @@ public interface PropertiesPackage extends EPackage {
     int TEXT_DESCRIPTION = 5;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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;
 
     /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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;
 
     /**
-     * The feature id for the '<em><b>Value Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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;
 
     /**
-     * The feature id for the '<em><b>Initial Operation</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Initial Operation</b></em>' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int TEXT_DESCRIPTION__INITIAL_OPERATION = WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
 
     /**
-     * The number of structural features of the '<em>Text Description</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The number of structural features of the '<em>Text Description</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int TEXT_DESCRIPTION_FEATURE_COUNT = WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
 
     /**
-     * The meta object id for the '{@link org.eclipse.sirius.properties.impl.LabelDescriptionImpl <em>Label Description</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.ButtonDescriptionImpl
+     * <em>Button Description</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @see org.eclipse.sirius.properties.impl.ButtonDescriptionImpl
+     * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getButtonDescription()
+     * @generated
+     */
+    int BUTTON_DESCRIPTION = 6;
+
+    /**
+     * 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;
+
+    /**
+     * 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;
+
+    /**
+     * The feature id for the '<em><b>Button Label Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION = 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 BUTTON_DESCRIPTION__INITIAL_OPERATION = WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
+
+    /**
+     * The number of structural features of the '<em>Button Description</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     * @ordered
+     */
+    int BUTTON_DESCRIPTION_FEATURE_COUNT = WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
+
+    /**
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.LabelDescriptionImpl
+     * <em>Label Description</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see org.eclipse.sirius.properties.impl.LabelDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getLabelDescription()
      * @generated
      */
-    int LABEL_DESCRIPTION = 6;
+    int LABEL_DESCRIPTION = 7;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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;
 
     /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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;
 
     /**
-     * The number of structural features of the '<em>Label Description</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The number of structural features of the '<em>Label Description</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int LABEL_DESCRIPTION_FEATURE_COUNT = WIDGET_DESCRIPTION_FEATURE_COUNT + 0;
 
     /**
-     * The meta object id for the '{@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl <em>Checkbox Description</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl
+     * <em>Checkbox Description</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCheckboxDescription()
      * @generated
      */
-    int CHECKBOX_DESCRIPTION = 7;
+    int CHECKBOX_DESCRIPTION = 8;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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;
 
     /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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;
 
     /**
-     * The feature id for the '<em><b>Value Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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;
 
     /**
-     * The feature id for the '<em><b>Initial Operation</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Initial Operation</b></em>' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int CHECKBOX_DESCRIPTION__INITIAL_OPERATION = WIDGET_DESCRIPTION_FEATURE_COUNT + 1;
 
     /**
-     * The number of structural features of the '<em>Checkbox Description</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The number of structural features of the '<em>Checkbox Description</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int CHECKBOX_DESCRIPTION_FEATURE_COUNT = WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
 
     /**
-     * The meta object id for the '{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl <em>Select Description</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl
+     * <em>Select Description</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see org.eclipse.sirius.properties.impl.SelectDescriptionImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSelectDescription()
      * @generated
      */
-    int SELECT_DESCRIPTION = 8;
+    int SELECT_DESCRIPTION = 9;
 
     /**
-     * The feature id for the '<em><b>Identifier</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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;
 
     /**
-     * The feature id for the '<em><b>Label Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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;
 
     /**
-     * The feature id for the '<em><b>Value Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * 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;
 
     /**
-     * The feature id for the '<em><b>Initial Operation</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Initial Operation</b></em>' containment
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
@@ -545,54 +617,56 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The feature id for the '<em><b>Candidates Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int SELECT_DESCRIPTION__CANDIDATES_EXPRESSION = WIDGET_DESCRIPTION_FEATURE_COUNT + 2;
 
     /**
-     * The feature id for the '<em><b>Candidate Display Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Candidate Display Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION = WIDGET_DESCRIPTION_FEATURE_COUNT + 3;
 
     /**
-     * The number of structural features of the '<em>Select Description</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The number of structural features of the '<em>Select Description</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int SELECT_DESCRIPTION_FEATURE_COUNT = WIDGET_DESCRIPTION_FEATURE_COUNT + 4;
 
     /**
-     * The meta object id for the '{@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl <em>Dynamic Mapping For</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl
+     * <em>Dynamic Mapping For</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see org.eclipse.sirius.properties.impl.DynamicMappingForImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getDynamicMappingFor()
      * @generated
      */
-    int DYNAMIC_MAPPING_FOR = 9;
+    int DYNAMIC_MAPPING_FOR = 10;
 
     /**
-     * The feature id for the '<em><b>Iterator</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Iterator</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int DYNAMIC_MAPPING_FOR__ITERATOR = 0;
 
     /**
-     * The feature id for the '<em><b>Domain Class Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Domain Class Expression</b></em>'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
@@ -600,73 +674,77 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The feature id for the '<em><b>Switch</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int DYNAMIC_MAPPING_FOR__SWITCH = 2;
 
     /**
-     * The number of structural features of the '<em>Dynamic Mapping For</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The number of structural features of the '<em>Dynamic Mapping For</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int DYNAMIC_MAPPING_FOR_FEATURE_COUNT = 3;
 
     /**
-     * The meta object id for the '{@link org.eclipse.sirius.properties.impl.DynamicMappingSwitchImpl <em>Dynamic Mapping Switch</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.DynamicMappingSwitchImpl
+     * <em>Dynamic Mapping Switch</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see org.eclipse.sirius.properties.impl.DynamicMappingSwitchImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getDynamicMappingSwitch()
      * @generated
      */
-    int DYNAMIC_MAPPING_SWITCH = 10;
+    int DYNAMIC_MAPPING_SWITCH = 11;
 
     /**
      * The feature id for the '<em><b>Switch Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION = 0;
 
     /**
-     * The feature id for the '<em><b>Cases</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Cases</b></em>' containment reference
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int DYNAMIC_MAPPING_SWITCH__CASES = 1;
 
     /**
-     * The number of structural features of the '<em>Dynamic Mapping Switch</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The number of structural features of the '<em>Dynamic Mapping Switch</em>
+     * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int DYNAMIC_MAPPING_SWITCH_FEATURE_COUNT = 2;
 
     /**
-     * The meta object id for the '{@link org.eclipse.sirius.properties.impl.DynamicMappingCaseImpl <em>Dynamic Mapping Case</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The meta object id for the '
+     * {@link org.eclipse.sirius.properties.impl.DynamicMappingCaseImpl
+     * <em>Dynamic Mapping Case</em>}' class. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see org.eclipse.sirius.properties.impl.DynamicMappingCaseImpl
      * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getDynamicMappingCase()
      * @generated
      */
-    int DYNAMIC_MAPPING_CASE = 11;
+    int DYNAMIC_MAPPING_CASE = 12;
 
     /**
-     * The feature id for the '<em><b>Case Expression</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The feature id for the '<em><b>Case Expression</b></em>' attribute. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
@@ -674,27 +752,28 @@ public interface PropertiesPackage extends EPackage {
 
     /**
      * The feature id for the '<em><b>Widget</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int DYNAMIC_MAPPING_CASE__WIDGET = 1;
 
     /**
-     * The number of structural features of the '<em>Dynamic Mapping Case</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The number of structural features of the '<em>Dynamic Mapping Case</em>'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      * @ordered
      */
     int DYNAMIC_MAPPING_CASE_FEATURE_COUNT = 2;
 
-
     /**
-     * Returns the meta object for class '{@link org.eclipse.sirius.properties.ViewExtensionDescription <em>View Extension Description</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.ViewExtensionDescription
+     * <em>View Extension Description</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @return the meta object for class '<em>View Extension Description</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription
      * @generated
@@ -702,9 +781,10 @@ public interface PropertiesPackage extends EPackage {
     EClass getViewExtensionDescription();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getIdentifier <em>Identifier</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getIdentifier
+     * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getIdentifier()
      * @see #getViewExtensionDescription()
@@ -713,9 +793,10 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getViewExtensionDescription_Identifier();
 
     /**
-     * Returns the meta object for the reference list '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getMetamodels <em>Metamodels</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the reference list '
+     * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getMetamodels
+     * <em>Metamodels</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the meta object for the reference list '<em>Metamodels</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getMetamodels()
      * @see #getViewExtensionDescription()
@@ -724,10 +805,12 @@ public interface PropertiesPackage extends EPackage {
     EReference getViewExtensionDescription_Metamodels();
 
     /**
-     * Returns the meta object for the containment reference list '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getPages <em>Pages</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Pages</em>'.
+     * Returns the meta object for the containment reference list '
+     * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getPages
+     * <em>Pages</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the containment reference list '
+     *         <em>Pages</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getPages()
      * @see #getViewExtensionDescription()
      * @generated
@@ -735,9 +818,10 @@ public interface PropertiesPackage extends EPackage {
     EReference getViewExtensionDescription_Pages();
 
     /**
-     * Returns the meta object for the reference '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getDefaultPage <em>Default Page</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the reference '
+     * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getDefaultPage
+     * <em>Default Page</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the meta object for the reference '<em>Default Page</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getDefaultPage()
      * @see #getViewExtensionDescription()
@@ -746,9 +830,11 @@ public interface PropertiesPackage extends EPackage {
     EReference getViewExtensionDescription_DefaultPage();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getLabelExpression <em>Label Expression</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@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()
@@ -757,10 +843,12 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getViewExtensionDescription_LabelExpression();
 
     /**
-     * Returns the meta object for the containment reference list '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getGroups <em>Groups</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Groups</em>'.
+     * Returns the meta object for the containment reference list '
+     * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getGroups
+     * <em>Groups</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the containment reference list '
+     *         <em>Groups</em>'.
      * @see org.eclipse.sirius.properties.ViewExtensionDescription#getGroups()
      * @see #getViewExtensionDescription()
      * @generated
@@ -768,9 +856,11 @@ public interface PropertiesPackage extends EPackage {
     EReference getViewExtensionDescription_Groups();
 
     /**
-     * Returns the meta object for class '{@link org.eclipse.sirius.properties.PageDescription <em>Page Description</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for class '
+     * {@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
@@ -778,9 +868,10 @@ public interface PropertiesPackage extends EPackage {
     EClass getPageDescription();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.PageDescription#getIdentifier <em>Identifier</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.PageDescription#getIdentifier
+     * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getIdentifier()
      * @see #getPageDescription()
@@ -789,9 +880,11 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getPageDescription_Identifier();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.PageDescription#getLabelExpression <em>Label Expression</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@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()
@@ -800,9 +893,10 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getPageDescription_LabelExpression();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.PageDescription#getDomainClass <em>Domain Class</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.PageDescription#getDomainClass
+     * <em>Domain Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the meta object for the attribute '<em>Domain Class</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getDomainClass()
      * @see #getPageDescription()
@@ -811,10 +905,13 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getPageDescription_DomainClass();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.PageDescription#getSemanticCandidateExpression <em>Semantic Candidate Expression</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Semantic Candidate Expression</em>'.
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.PageDescription#getSemanticCandidateExpression
+     * <em>Semantic Candidate Expression</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the meta object for the attribute '
+     *         <em>Semantic Candidate Expression</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getSemanticCandidateExpression()
      * @see #getPageDescription()
      * @generated
@@ -822,9 +919,10 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getPageDescription_SemanticCandidateExpression();
 
     /**
-     * Returns the meta object for the reference list '{@link org.eclipse.sirius.properties.PageDescription#getGroups <em>Groups</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the reference list '
+     * {@link org.eclipse.sirius.properties.PageDescription#getGroups
+     * <em>Groups</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the meta object for the reference list '<em>Groups</em>'.
      * @see org.eclipse.sirius.properties.PageDescription#getGroups()
      * @see #getPageDescription()
@@ -833,9 +931,11 @@ public interface PropertiesPackage extends EPackage {
     EReference getPageDescription_Groups();
 
     /**
-     * Returns the meta object for class '{@link org.eclipse.sirius.properties.GroupDescription <em>Group Description</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for class '
+     * {@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
@@ -843,9 +943,10 @@ public interface PropertiesPackage extends EPackage {
     EClass getGroupDescription();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.GroupDescription#getIdentifier <em>Identifier</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.GroupDescription#getIdentifier
+     * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription#getIdentifier()
      * @see #getGroupDescription()
@@ -854,9 +955,11 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getGroupDescription_Identifier();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.GroupDescription#getLabelExpression <em>Label Expression</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@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()
@@ -865,9 +968,10 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getGroupDescription_LabelExpression();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.GroupDescription#getDomainClass <em>Domain Class</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.GroupDescription#getDomainClass
+     * <em>Domain Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the meta object for the attribute '<em>Domain Class</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription#getDomainClass()
      * @see #getGroupDescription()
@@ -876,10 +980,13 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getGroupDescription_DomainClass();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.GroupDescription#getSemanticCandidateExpression <em>Semantic Candidate Expression</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Semantic Candidate Expression</em>'.
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.GroupDescription#getSemanticCandidateExpression
+     * <em>Semantic Candidate Expression</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the meta object for the attribute '
+     *         <em>Semantic Candidate Expression</em>'.
      * @see org.eclipse.sirius.properties.GroupDescription#getSemanticCandidateExpression()
      * @see #getGroupDescription()
      * @generated
@@ -887,10 +994,12 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getGroupDescription_SemanticCandidateExpression();
 
     /**
-     * Returns the meta object for the containment reference '{@link org.eclipse.sirius.properties.GroupDescription#getContainer <em>Container</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference '<em>Container</em>'.
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.GroupDescription#getContainer
+     * <em>Container</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the containment reference '<em>Container</em>
+     *         '.
      * @see org.eclipse.sirius.properties.GroupDescription#getContainer()
      * @see #getGroupDescription()
      * @generated
@@ -898,9 +1007,11 @@ public interface PropertiesPackage extends EPackage {
     EReference getGroupDescription_Container();
 
     /**
-     * Returns the meta object for class '{@link org.eclipse.sirius.properties.ContainerDescription <em>Container Description</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.ContainerDescription
+     * <em>Container Description</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @return the meta object for class '<em>Container Description</em>'.
      * @see org.eclipse.sirius.properties.ContainerDescription
      * @generated
@@ -908,9 +1019,10 @@ public interface PropertiesPackage extends EPackage {
     EClass getContainerDescription();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.ContainerDescription#getIdentifier <em>Identifier</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.ContainerDescription#getIdentifier
+     * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.ContainerDescription#getIdentifier()
      * @see #getContainerDescription()
@@ -919,10 +1031,12 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getContainerDescription_Identifier();
 
     /**
-     * Returns the meta object for the containment reference list '{@link org.eclipse.sirius.properties.ContainerDescription#getWidgets <em>Widgets</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Widgets</em>'.
+     * Returns the meta object for the containment reference list '
+     * {@link org.eclipse.sirius.properties.ContainerDescription#getWidgets
+     * <em>Widgets</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the containment reference list '
+     *         <em>Widgets</em>'.
      * @see org.eclipse.sirius.properties.ContainerDescription#getWidgets()
      * @see #getContainerDescription()
      * @generated
@@ -930,10 +1044,13 @@ public interface PropertiesPackage extends EPackage {
     EReference getContainerDescription_Widgets();
 
     /**
-     * Returns the meta object for the containment reference list '{@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>'.
+     * Returns the meta object for the containment reference list '
+     * {@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()
      * @see #getContainerDescription()
      * @generated
@@ -941,9 +1058,11 @@ public interface PropertiesPackage extends EPackage {
     EReference getContainerDescription_DynamicMappings();
 
     /**
-     * Returns the meta object for class '{@link org.eclipse.sirius.properties.WidgetDescription <em>Widget Description</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for class '
+     * {@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
@@ -951,9 +1070,10 @@ public interface PropertiesPackage extends EPackage {
     EClass getWidgetDescription();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.WidgetDescription#getIdentifier <em>Identifier</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.WidgetDescription#getIdentifier
+     * <em>Identifier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the meta object for the attribute '<em>Identifier</em>'.
      * @see org.eclipse.sirius.properties.WidgetDescription#getIdentifier()
      * @see #getWidgetDescription()
@@ -962,9 +1082,11 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getWidgetDescription_Identifier();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.WidgetDescription#getLabelExpression <em>Label Expression</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@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()
@@ -973,9 +1095,11 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getWidgetDescription_LabelExpression();
 
     /**
-     * Returns the meta object for class '{@link org.eclipse.sirius.properties.TextDescription <em>Text Description</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for class '
+     * {@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
@@ -983,9 +1107,11 @@ public interface PropertiesPackage extends EPackage {
     EClass getTextDescription();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.TextDescription#getValueExpression <em>Value Expression</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@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()
@@ -994,10 +1120,13 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getTextDescription_ValueExpression();
 
     /**
-     * Returns the meta object for the containment reference '{@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>'.
+     * Returns the meta object for the containment reference '
+     * {@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()
      * @see #getTextDescription()
      * @generated
@@ -1005,9 +1134,51 @@ public interface PropertiesPackage extends EPackage {
     EReference getTextDescription_InitialOperation();
 
     /**
-     * Returns the meta object for class '{@link org.eclipse.sirius.properties.LabelDescription <em>Label Description</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for class '
+     * {@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
+     */
+    EClass getButtonDescription();
+
+    /**
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.ButtonDescription#getButtonLabelExpression
+     * <em>Button Label Expression</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the meta object for the attribute '
+     *         <em>Button Label Expression</em>'.
+     * @see org.eclipse.sirius.properties.ButtonDescription#getButtonLabelExpression()
+     * @see #getButtonDescription()
+     * @generated
+     */
+    EAttribute getButtonDescription_ButtonLabelExpression();
+
+    /**
+     * Returns the meta object for the containment reference '
+     * {@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()
+     * @see #getButtonDescription()
+     * @generated
+     */
+    EReference getButtonDescription_InitialOperation();
+
+    /**
+     * Returns the meta object for class '
+     * {@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
@@ -1015,9 +1186,11 @@ public interface PropertiesPackage extends EPackage {
     EClass getLabelDescription();
 
     /**
-     * Returns the meta object for class '{@link org.eclipse.sirius.properties.CheckboxDescription <em>Checkbox Description</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.CheckboxDescription
+     * <em>Checkbox Description</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @return the meta object for class '<em>Checkbox Description</em>'.
      * @see org.eclipse.sirius.properties.CheckboxDescription
      * @generated
@@ -1025,9 +1198,11 @@ public interface PropertiesPackage extends EPackage {
     EClass getCheckboxDescription();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.CheckboxDescription#getValueExpression <em>Value Expression</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@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()
@@ -1036,10 +1211,13 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getCheckboxDescription_ValueExpression();
 
     /**
-     * Returns the meta object for the containment reference '{@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>'.
+     * Returns the meta object for the containment reference '
+     * {@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()
      * @see #getCheckboxDescription()
      * @generated
@@ -1047,9 +1225,11 @@ public interface PropertiesPackage extends EPackage {
     EReference getCheckboxDescription_InitialOperation();
 
     /**
-     * Returns the meta object for class '{@link org.eclipse.sirius.properties.SelectDescription <em>Select Description</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for class '
+     * {@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
@@ -1057,9 +1237,11 @@ public interface PropertiesPackage extends EPackage {
     EClass getSelectDescription();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.SelectDescription#getValueExpression <em>Value Expression</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@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()
@@ -1068,10 +1250,13 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getSelectDescription_ValueExpression();
 
     /**
-     * Returns the meta object for the containment reference '{@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>'.
+     * Returns the meta object for the containment reference '
+     * {@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()
      * @see #getSelectDescription()
      * @generated
@@ -1079,10 +1264,13 @@ public interface PropertiesPackage extends EPackage {
     EReference getSelectDescription_InitialOperation();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.SelectDescription#getCandidatesExpression <em>Candidates Expression</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Candidates Expression</em>'.
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.SelectDescription#getCandidatesExpression
+     * <em>Candidates Expression</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the meta object for the attribute '<em>Candidates Expression</em>
+     *         '.
      * @see org.eclipse.sirius.properties.SelectDescription#getCandidatesExpression()
      * @see #getSelectDescription()
      * @generated
@@ -1090,10 +1278,13 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getSelectDescription_CandidatesExpression();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression <em>Candidate Display Expression</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Candidate Display Expression</em>'.
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression
+     * <em>Candidate Display Expression</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the meta object for the attribute '
+     *         <em>Candidate Display Expression</em>'.
      * @see org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression()
      * @see #getSelectDescription()
      * @generated
@@ -1101,9 +1292,11 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getSelectDescription_CandidateDisplayExpression();
 
     /**
-     * Returns the meta object for class '{@link org.eclipse.sirius.properties.DynamicMappingFor <em>Dynamic Mapping For</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for class '
+     * {@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
@@ -1111,9 +1304,10 @@ public interface PropertiesPackage extends EPackage {
     EClass getDynamicMappingFor();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.DynamicMappingFor#getIterator <em>Iterator</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.DynamicMappingFor#getIterator
+     * <em>Iterator</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the meta object for the attribute '<em>Iterator</em>'.
      * @see org.eclipse.sirius.properties.DynamicMappingFor#getIterator()
      * @see #getDynamicMappingFor()
@@ -1122,10 +1316,13 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getDynamicMappingFor_Iterator();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression <em>Domain Class Expression</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Domain Class Expression</em>'.
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression
+     * <em>Domain Class Expression</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the meta object for the attribute '
+     *         <em>Domain Class Expression</em>'.
      * @see org.eclipse.sirius.properties.DynamicMappingFor#getDomainClassExpression()
      * @see #getDynamicMappingFor()
      * @generated
@@ -1133,9 +1330,10 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getDynamicMappingFor_DomainClassExpression();
 
     /**
-     * Returns the meta object for the containment reference '{@link org.eclipse.sirius.properties.DynamicMappingFor#getSwitch <em>Switch</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.DynamicMappingFor#getSwitch
+     * <em>Switch</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the meta object for the containment reference '<em>Switch</em>'.
      * @see org.eclipse.sirius.properties.DynamicMappingFor#getSwitch()
      * @see #getDynamicMappingFor()
@@ -1144,9 +1342,11 @@ public interface PropertiesPackage extends EPackage {
     EReference getDynamicMappingFor_Switch();
 
     /**
-     * Returns the meta object for class '{@link org.eclipse.sirius.properties.DynamicMappingSwitch <em>Dynamic Mapping Switch</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.DynamicMappingSwitch
+     * <em>Dynamic Mapping Switch</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @return the meta object for class '<em>Dynamic Mapping Switch</em>'.
      * @see org.eclipse.sirius.properties.DynamicMappingSwitch
      * @generated
@@ -1154,9 +1354,11 @@ public interface PropertiesPackage extends EPackage {
     EClass getDynamicMappingSwitch();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.DynamicMappingSwitch#getSwitchExpression <em>Switch Expression</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@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()
@@ -1165,10 +1367,12 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getDynamicMappingSwitch_SwitchExpression();
 
     /**
-     * Returns the meta object for the containment reference list '{@link org.eclipse.sirius.properties.DynamicMappingSwitch#getCases <em>Cases</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Cases</em>'.
+     * Returns the meta object for the containment reference list '
+     * {@link org.eclipse.sirius.properties.DynamicMappingSwitch#getCases
+     * <em>Cases</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @return the meta object for the containment reference list '
+     *         <em>Cases</em>'.
      * @see org.eclipse.sirius.properties.DynamicMappingSwitch#getCases()
      * @see #getDynamicMappingSwitch()
      * @generated
@@ -1176,9 +1380,11 @@ public interface PropertiesPackage extends EPackage {
     EReference getDynamicMappingSwitch_Cases();
 
     /**
-     * Returns the meta object for class '{@link org.eclipse.sirius.properties.DynamicMappingCase <em>Dynamic Mapping Case</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for class '
+     * {@link org.eclipse.sirius.properties.DynamicMappingCase
+     * <em>Dynamic Mapping Case</em>}'. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @return the meta object for class '<em>Dynamic Mapping Case</em>'.
      * @see org.eclipse.sirius.properties.DynamicMappingCase
      * @generated
@@ -1186,9 +1392,10 @@ public interface PropertiesPackage extends EPackage {
     EClass getDynamicMappingCase();
 
     /**
-     * Returns the meta object for the attribute '{@link org.eclipse.sirius.properties.DynamicMappingCase#getCaseExpression <em>Case Expression</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the attribute '
+     * {@link org.eclipse.sirius.properties.DynamicMappingCase#getCaseExpression
+     * <em>Case Expression</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the meta object for the attribute '<em>Case Expression</em>'.
      * @see org.eclipse.sirius.properties.DynamicMappingCase#getCaseExpression()
      * @see #getDynamicMappingCase()
@@ -1197,9 +1404,10 @@ public interface PropertiesPackage extends EPackage {
     EAttribute getDynamicMappingCase_CaseExpression();
 
     /**
-     * Returns the meta object for the containment reference '{@link org.eclipse.sirius.properties.DynamicMappingCase#getWidget <em>Widget</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the meta object for the containment reference '
+     * {@link org.eclipse.sirius.properties.DynamicMappingCase#getWidget
+     * <em>Widget</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the meta object for the containment reference '<em>Widget</em>'.
      * @see org.eclipse.sirius.properties.DynamicMappingCase#getWidget()
      * @see #getDynamicMappingCase()
@@ -1208,31 +1416,34 @@ public interface PropertiesPackage extends EPackage {
     EReference getDynamicMappingCase_Widget();
 
     /**
-     * Returns the factory that creates the instances of the model.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Returns the factory that creates the instances of the model. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @return the factory that creates the instances of the model.
      * @generated
      */
     PropertiesFactory getPropertiesFactory();
 
     /**
-     * <!-- begin-user-doc -->
-     * Defines literals for the meta objects that represent
+     * <!-- begin-user-doc --> Defines literals for the meta objects that
+     * represent
      * <ul>
-     *   <li>each class,</li>
-     *   <li>each feature of each class,</li>
-     *   <li>each enum,</li>
-     *   <li>and each data type</li>
+     * <li>each class,</li>
+     * <li>each feature of each class,</li>
+     * <li>each enum,</li>
+     * <li>and each data type</li>
      * </ul>
      * <!-- end-user-doc -->
+     * 
      * @generated
      */
     interface Literals {
         /**
-         * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl <em>View Extension Description</em>}' class.
-         * <!-- begin-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl
+         * <em>View Extension Description</em>}' class. <!-- begin-user-doc -->
          * <!-- end-user-doc -->
+         * 
          * @see org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getViewExtensionDescription()
          * @generated
@@ -1240,57 +1451,59 @@ public interface PropertiesPackage extends EPackage {
         EClass VIEW_EXTENSION_DESCRIPTION = eINSTANCE.getViewExtensionDescription();
 
         /**
-         * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Identifier</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute VIEW_EXTENSION_DESCRIPTION__IDENTIFIER = eINSTANCE.getViewExtensionDescription_Identifier();
 
         /**
-         * The meta object literal for the '<em><b>Metamodels</b></em>' reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Metamodels</b></em>'
+         * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EReference VIEW_EXTENSION_DESCRIPTION__METAMODELS = eINSTANCE.getViewExtensionDescription_Metamodels();
 
         /**
-         * The meta object literal for the '<em><b>Pages</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Pages</b></em>' containment
+         * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EReference VIEW_EXTENSION_DESCRIPTION__PAGES = eINSTANCE.getViewExtensionDescription_Pages();
 
         /**
-         * The meta object literal for the '<em><b>Default Page</b></em>' reference feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Default Page</b></em>'
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EReference VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE = eINSTANCE.getViewExtensionDescription_DefaultPage();
 
         /**
-         * The meta object literal for the '<em><b>Label Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Label Expression</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION = eINSTANCE.getViewExtensionDescription_LabelExpression();
 
         /**
-         * The meta object literal for the '<em><b>Groups</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Groups</b></em>' containment
+         * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EReference VIEW_EXTENSION_DESCRIPTION__GROUPS = eINSTANCE.getViewExtensionDescription_Groups();
 
         /**
-         * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.PageDescriptionImpl <em>Page Description</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.PageDescriptionImpl
+         * <em>Page Description</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @see org.eclipse.sirius.properties.impl.PageDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getPageDescription()
          * @generated
@@ -1298,49 +1511,52 @@ public interface PropertiesPackage extends EPackage {
         EClass PAGE_DESCRIPTION = eINSTANCE.getPageDescription();
 
         /**
-         * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Identifier</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute PAGE_DESCRIPTION__IDENTIFIER = eINSTANCE.getPageDescription_Identifier();
 
         /**
-         * The meta object literal for the '<em><b>Label Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Label Expression</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute PAGE_DESCRIPTION__LABEL_EXPRESSION = eINSTANCE.getPageDescription_LabelExpression();
 
         /**
-         * The meta object literal for the '<em><b>Domain Class</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Domain Class</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute PAGE_DESCRIPTION__DOMAIN_CLASS = eINSTANCE.getPageDescription_DomainClass();
 
         /**
-         * The meta object literal for the '<em><b>Semantic Candidate Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '
+         * <em><b>Semantic Candidate Expression</b></em>' attribute feature.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION = eINSTANCE.getPageDescription_SemanticCandidateExpression();
 
         /**
-         * The meta object literal for the '<em><b>Groups</b></em>' reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Groups</b></em>' reference
+         * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EReference PAGE_DESCRIPTION__GROUPS = eINSTANCE.getPageDescription_Groups();
 
         /**
-         * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl <em>Group Description</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl
+         * <em>Group Description</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @see org.eclipse.sirius.properties.impl.GroupDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getGroupDescription()
          * @generated
@@ -1348,49 +1564,53 @@ public interface PropertiesPackage extends EPackage {
         EClass GROUP_DESCRIPTION = eINSTANCE.getGroupDescription();
 
         /**
-         * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Identifier</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute GROUP_DESCRIPTION__IDENTIFIER = eINSTANCE.getGroupDescription_Identifier();
 
         /**
-         * The meta object literal for the '<em><b>Label Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Label Expression</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute GROUP_DESCRIPTION__LABEL_EXPRESSION = eINSTANCE.getGroupDescription_LabelExpression();
 
         /**
-         * The meta object literal for the '<em><b>Domain Class</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Domain Class</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute GROUP_DESCRIPTION__DOMAIN_CLASS = eINSTANCE.getGroupDescription_DomainClass();
 
         /**
-         * The meta object literal for the '<em><b>Semantic Candidate Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '
+         * <em><b>Semantic Candidate Expression</b></em>' attribute feature.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION = eINSTANCE.getGroupDescription_SemanticCandidateExpression();
 
         /**
-         * The meta object literal for the '<em><b>Container</b></em>' containment reference feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Container</b></em>'
+         * containment reference feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @generated
          */
         EReference GROUP_DESCRIPTION__CONTAINER = eINSTANCE.getGroupDescription_Container();
 
         /**
-         * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl <em>Container Description</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl
+         * <em>Container Description</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @see org.eclipse.sirius.properties.impl.ContainerDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getContainerDescription()
          * @generated
@@ -1398,33 +1618,36 @@ public interface PropertiesPackage extends EPackage {
         EClass CONTAINER_DESCRIPTION = eINSTANCE.getContainerDescription();
 
         /**
-         * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Identifier</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute CONTAINER_DESCRIPTION__IDENTIFIER = eINSTANCE.getContainerDescription_Identifier();
 
         /**
-         * The meta object literal for the '<em><b>Widgets</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Widgets</b></em>' containment
+         * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EReference CONTAINER_DESCRIPTION__WIDGETS = eINSTANCE.getContainerDescription_Widgets();
 
         /**
-         * The meta object literal for the '<em><b>Dynamic Mappings</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Dynamic Mappings</b></em>'
+         * containment reference list feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @generated
          */
         EReference CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS = eINSTANCE.getContainerDescription_DynamicMappings();
 
         /**
-         * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl <em>Widget Description</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl
+         * <em>Widget Description</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @see org.eclipse.sirius.properties.impl.WidgetDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getWidgetDescription()
          * @generated
@@ -1432,25 +1655,27 @@ public interface PropertiesPackage extends EPackage {
         EClass WIDGET_DESCRIPTION = eINSTANCE.getWidgetDescription();
 
         /**
-         * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Identifier</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute WIDGET_DESCRIPTION__IDENTIFIER = eINSTANCE.getWidgetDescription_Identifier();
 
         /**
-         * The meta object literal for the '<em><b>Label Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Label Expression</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute WIDGET_DESCRIPTION__LABEL_EXPRESSION = eINSTANCE.getWidgetDescription_LabelExpression();
 
         /**
-         * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.TextDescriptionImpl <em>Text Description</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.TextDescriptionImpl
+         * <em>Text Description</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @see org.eclipse.sirius.properties.impl.TextDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getTextDescription()
          * @generated
@@ -1458,25 +1683,58 @@ public interface PropertiesPackage extends EPackage {
         EClass TEXT_DESCRIPTION = eINSTANCE.getTextDescription();
 
         /**
-         * The meta object literal for the '<em><b>Value Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Value Expression</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute TEXT_DESCRIPTION__VALUE_EXPRESSION = eINSTANCE.getTextDescription_ValueExpression();
 
         /**
-         * The meta object literal for the '<em><b>Initial Operation</b></em>' containment reference feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Initial Operation</b></em>'
+         * containment reference feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @generated
          */
         EReference TEXT_DESCRIPTION__INITIAL_OPERATION = eINSTANCE.getTextDescription_InitialOperation();
 
         /**
-         * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.LabelDescriptionImpl <em>Label Description</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.ButtonDescriptionImpl
+         * <em>Button Description</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @see org.eclipse.sirius.properties.impl.ButtonDescriptionImpl
+         * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getButtonDescription()
+         * @generated
+         */
+        EClass BUTTON_DESCRIPTION = 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();
+
+        /**
+         * The meta object literal for the '<em><b>Initial Operation</b></em>'
+         * containment reference feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
+         * @generated
+         */
+        EReference BUTTON_DESCRIPTION__INITIAL_OPERATION = eINSTANCE.getButtonDescription_InitialOperation();
+
+        /**
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.LabelDescriptionImpl
+         * <em>Label Description</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @see org.eclipse.sirius.properties.impl.LabelDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getLabelDescription()
          * @generated
@@ -1484,9 +1742,11 @@ public interface PropertiesPackage extends EPackage {
         EClass LABEL_DESCRIPTION = eINSTANCE.getLabelDescription();
 
         /**
-         * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl <em>Checkbox Description</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl
+         * <em>Checkbox Description</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @see org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getCheckboxDescription()
          * @generated
@@ -1494,25 +1754,28 @@ public interface PropertiesPackage extends EPackage {
         EClass CHECKBOX_DESCRIPTION = eINSTANCE.getCheckboxDescription();
 
         /**
-         * The meta object literal for the '<em><b>Value Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Value Expression</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute CHECKBOX_DESCRIPTION__VALUE_EXPRESSION = eINSTANCE.getCheckboxDescription_ValueExpression();
 
         /**
-         * The meta object literal for the '<em><b>Initial Operation</b></em>' containment reference feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Initial Operation</b></em>'
+         * containment reference feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @generated
          */
         EReference CHECKBOX_DESCRIPTION__INITIAL_OPERATION = eINSTANCE.getCheckboxDescription_InitialOperation();
 
         /**
-         * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl <em>Select Description</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl
+         * <em>Select Description</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @see org.eclipse.sirius.properties.impl.SelectDescriptionImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getSelectDescription()
          * @generated
@@ -1520,41 +1783,46 @@ public interface PropertiesPackage extends EPackage {
         EClass SELECT_DESCRIPTION = eINSTANCE.getSelectDescription();
 
         /**
-         * The meta object literal for the '<em><b>Value Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Value Expression</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute SELECT_DESCRIPTION__VALUE_EXPRESSION = eINSTANCE.getSelectDescription_ValueExpression();
 
         /**
-         * The meta object literal for the '<em><b>Initial Operation</b></em>' containment reference feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Initial Operation</b></em>'
+         * containment reference feature. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @generated
          */
         EReference SELECT_DESCRIPTION__INITIAL_OPERATION = eINSTANCE.getSelectDescription_InitialOperation();
 
         /**
-         * The meta object literal for the '<em><b>Candidates Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * 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();
 
         /**
-         * The meta object literal for the '<em><b>Candidate Display Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * 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();
 
         /**
-         * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl <em>Dynamic Mapping For</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl
+         * <em>Dynamic Mapping For</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @see org.eclipse.sirius.properties.impl.DynamicMappingForImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getDynamicMappingFor()
          * @generated
@@ -1562,33 +1830,36 @@ public interface PropertiesPackage extends EPackage {
         EClass DYNAMIC_MAPPING_FOR = eINSTANCE.getDynamicMappingFor();
 
         /**
-         * The meta object literal for the '<em><b>Iterator</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Iterator</b></em>' attribute
+         * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute DYNAMIC_MAPPING_FOR__ITERATOR = eINSTANCE.getDynamicMappingFor_Iterator();
 
         /**
-         * The meta object literal for the '<em><b>Domain Class Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * 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();
 
         /**
-         * The meta object literal for the '<em><b>Switch</b></em>' containment reference feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Switch</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EReference DYNAMIC_MAPPING_FOR__SWITCH = eINSTANCE.getDynamicMappingFor_Switch();
 
         /**
-         * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.DynamicMappingSwitchImpl <em>Dynamic Mapping Switch</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.DynamicMappingSwitchImpl
+         * <em>Dynamic Mapping Switch</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @see org.eclipse.sirius.properties.impl.DynamicMappingSwitchImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getDynamicMappingSwitch()
          * @generated
@@ -1596,25 +1867,27 @@ public interface PropertiesPackage extends EPackage {
         EClass DYNAMIC_MAPPING_SWITCH = eINSTANCE.getDynamicMappingSwitch();
 
         /**
-         * The meta object literal for the '<em><b>Switch Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Switch Expression</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION = eINSTANCE.getDynamicMappingSwitch_SwitchExpression();
 
         /**
-         * The meta object literal for the '<em><b>Cases</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Cases</b></em>' containment
+         * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EReference DYNAMIC_MAPPING_SWITCH__CASES = eINSTANCE.getDynamicMappingSwitch_Cases();
 
         /**
-         * The meta object literal for the '{@link org.eclipse.sirius.properties.impl.DynamicMappingCaseImpl <em>Dynamic Mapping Case</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '
+         * {@link org.eclipse.sirius.properties.impl.DynamicMappingCaseImpl
+         * <em>Dynamic Mapping Case</em>}' class. <!-- begin-user-doc --> <!--
+         * end-user-doc -->
+         * 
          * @see org.eclipse.sirius.properties.impl.DynamicMappingCaseImpl
          * @see org.eclipse.sirius.properties.impl.PropertiesPackageImpl#getDynamicMappingCase()
          * @generated
@@ -1622,21 +1895,21 @@ public interface PropertiesPackage extends EPackage {
         EClass DYNAMIC_MAPPING_CASE = eINSTANCE.getDynamicMappingCase();
 
         /**
-         * The meta object literal for the '<em><b>Case Expression</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Case Expression</b></em>'
+         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EAttribute DYNAMIC_MAPPING_CASE__CASE_EXPRESSION = eINSTANCE.getDynamicMappingCase_CaseExpression();
 
         /**
-         * The meta object literal for the '<em><b>Widget</b></em>' containment reference feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
+         * The meta object literal for the '<em><b>Widget</b></em>' containment
+         * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+         * 
          * @generated
          */
         EReference DYNAMIC_MAPPING_CASE__WIDGET = eINSTANCE.getDynamicMappingCase_Widget();
 
     }
 
-} //PropertiesPackage
+} // PropertiesPackage
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 3815cb7ded..47db51b6f8 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
@@ -14,21 +14,27 @@ package org.eclipse.sirius.properties;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Select Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Select Description</b></em>'. <!-- end-user-doc -->
  *
- * <!-- begin-model-doc -->
- * Represents a collection of candidates used to edit a single or multi-valued property.
- * <!-- end-model-doc -->
+ * <!-- begin-model-doc --> Represents a collection of candidates used to edit a
+ * single or multi-valued property. <!-- end-model-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.SelectDescription#getValueExpression <em>Value Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.SelectDescription#getInitialOperation <em>Initial Operation</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.SelectDescription#getCandidatesExpression <em>Candidates Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression <em>Candidate Display Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.SelectDescription#getValueExpression
+ * <em>Value Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.SelectDescription#getInitialOperation
+ * <em>Initial Operation</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.SelectDescription#getCandidatesExpression
+ * <em>Candidates Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression
+ * <em>Candidate Display Expression</em>}</li>
  * </ul>
  * </p>
  *
@@ -39,37 +45,39 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 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 -->
+     * <!-- 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()
-     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getValueExpression();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.SelectDescription#getValueExpression <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Value Expression</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.SelectDescription#getValueExpression
+     * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Value Expression</em>' attribute.
      * @see #getValueExpression()
      * @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 combo.
-     * <!-- end-model-doc -->
-     * @return the value of the '<em>Initial Operation</em>' containment reference.
+     * 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 combo. <!-- end-model-doc -->
+     * 
+     * @return the value of the '<em>Initial Operation</em>' containment
+     *         reference.
      * @see #setInitialOperation(InitialOperation)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getSelectDescription_InitialOperation()
      * @model containment="true" required="true"
@@ -78,60 +86,73 @@ public interface SelectDescription extends WidgetDescription {
     InitialOperation getInitialOperation();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.SelectDescription#getInitialOperation <em>Initial Operation</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Initial Operation</em>' containment reference.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.SelectDescription#getInitialOperation
+     * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Initial Operation</em>' containment
+     *            reference.
      * @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 -->
+     * 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#getSelectDescription_CandidatesExpression()
-     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getCandidatesExpression();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.SelectDescription#getCandidatesExpression <em>Candidates Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Candidates Expression</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.SelectDescription#getCandidatesExpression
+     * <em>Candidates Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Candidates Expression</em>'
+     *            attribute.
      * @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.
+     * 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#getSelectDescription_CandidateDisplayExpression()
-     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getCandidateDisplayExpression();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression <em>Candidate Display Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Candidate Display Expression</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.SelectDescription#getCandidateDisplayExpression
+     * <em>Candidate Display Expression</em>}' attribute. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Candidate Display Expression</em>'
+     *            attribute.
      * @see #getCandidateDisplayExpression()
      * @generated
      */
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 fd43c37b41..ee671ee3dd 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
@@ -14,15 +14,16 @@ package org.eclipse.sirius.properties;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Text Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Text Description</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.TextDescription#getValueExpression <em>Value Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.TextDescription#getInitialOperation <em>Initial Operation</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.TextDescription#getValueExpression
+ * <em>Value Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.TextDescription#getInitialOperation
+ * <em>Initial Operation</em>}</li>
  * </ul>
  * </p>
  *
@@ -39,33 +40,40 @@ public interface TextDescription extends WidgetDescription {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>Value Expression</em>' attribute.
      * @see #setValueExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getTextDescription_ValueExpression()
-     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getValueExpression();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.TextDescription#getValueExpression <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Value Expression</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.TextDescription#getValueExpression
+     * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Value Expression</em>' attribute.
      * @see #getValueExpression()
      * @generated
      */
     void setValueExpression(String value);
 
     /**
-     * Returns the value of the '<em><b>Initial Operation</b></em>' containment reference.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Initial Operation</b></em>' containment
+     * reference. <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Initial Operation</em>' containment reference isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Initial Operation</em>' containment reference
+     * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * @return the value of the '<em>Initial Operation</em>' containment reference.
+     * 
+     * @return the value of the '<em>Initial Operation</em>' containment
+     *         reference.
      * @see #setInitialOperation(InitialOperation)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getTextDescription_InitialOperation()
      * @model containment="true" required="true"
@@ -74,10 +82,14 @@ public interface TextDescription extends WidgetDescription {
     InitialOperation getInitialOperation();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.TextDescription#getInitialOperation <em>Initial Operation</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Initial Operation</em>' containment reference.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.TextDescription#getInitialOperation
+     * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Initial Operation</em>' containment
+     *            reference.
      * @see #getInitialOperation()
      * @generated
      */
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 cbb90d2947..ab042c0bb5 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
@@ -12,25 +12,32 @@
 package org.eclipse.sirius.properties;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.sirius.viewpoint.description.Extension;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>View Extension Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>View Extension Description</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getMetamodels <em>Metamodels</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getPages <em>Pages</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getDefaultPage <em>Default Page</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getLabelExpression <em>Label Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getGroups <em>Groups</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getIdentifier
+ * <em>Identifier</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getMetamodels
+ * <em>Metamodels</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getPages
+ * <em>Pages</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getDefaultPage
+ * <em>Default Page</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getLabelExpression
+ * <em>Label Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.ViewExtensionDescription#getGroups
+ * <em>Groups</em>}</li>
  * </ul>
  * </p>
  *
@@ -40,13 +47,14 @@ import org.eclipse.sirius.viewpoint.description.Extension;
  */
 public interface ViewExtensionDescription extends Extension {
     /**
-     * Returns the value of the '<em><b>Identifier</b></em>' attribute.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!--
+     * begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there
+     * 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()
@@ -56,24 +64,28 @@ public interface ViewExtensionDescription extends Extension {
     String getIdentifier();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getIdentifier <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Identifier</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getIdentifier
+     * <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
      * @generated
      */
     void setIdentifier(String value);
 
     /**
-     * Returns the value of the '<em><b>Metamodels</b></em>' reference list.
-     * The list contents are of type {@link org.eclipse.emf.ecore.EPackage}.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Metamodels</b></em>' reference list. The
+     * list contents are of type {@link org.eclipse.emf.ecore.EPackage}. <!--
+     * begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Metamodels</em>' reference list isn't clear,
      * 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
@@ -82,14 +94,16 @@ public interface ViewExtensionDescription extends Extension {
     EList<EPackage> getMetamodels();
 
     /**
-     * Returns the value of the '<em><b>Pages</b></em>' containment reference list.
-     * The list contents are of type {@link org.eclipse.sirius.properties.PageDescription}.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Pages</b></em>' containment reference
+     * list. The list contents are of type
+     * {@link org.eclipse.sirius.properties.PageDescription}. <!--
+     * begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Pages</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Pages</em>' containment reference list isn't
+     * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>Pages</em>' containment reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription_Pages()
      * @model containment="true"
@@ -98,13 +112,14 @@ public interface ViewExtensionDescription extends Extension {
     EList<PageDescription> getPages();
 
     /**
-     * Returns the value of the '<em><b>Default Page</b></em>' reference.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Default Page</b></em>' reference. <!--
+     * begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Default Page</em>' reference isn't clear,
      * 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()
@@ -114,10 +129,13 @@ public interface ViewExtensionDescription extends Extension {
     PageDescription getDefaultPage();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getDefaultPage <em>Default Page</em>}' reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Default Page</em>' reference.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getDefaultPage
+     * <em>Default Page</em>}' reference. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Default Page</em>' reference.
      * @see #getDefaultPage()
      * @generated
      */
@@ -131,33 +149,40 @@ public interface ViewExtensionDescription extends Extension {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>Label Expression</em>' attribute.
      * @see #setLabelExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getViewExtensionDescription_LabelExpression()
-     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getLabelExpression();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.ViewExtensionDescription#getLabelExpression <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Label Expression</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.ViewExtensionDescription#getLabelExpression
+     * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Label Expression</em>' attribute.
      * @see #getLabelExpression()
      * @generated
      */
     void setLabelExpression(String value);
 
     /**
-     * Returns the value of the '<em><b>Groups</b></em>' containment reference list.
-     * The list contents are of type {@link org.eclipse.sirius.properties.GroupDescription}.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Groups</b></em>' containment reference
+     * list. The list contents are of type
+     * {@link org.eclipse.sirius.properties.GroupDescription}. <!--
+     * begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Groups</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Groups</em>' containment reference list isn't
+     * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>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 50c06840ba..15ac9cf817 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
@@ -14,15 +14,17 @@ package org.eclipse.sirius.properties;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Widget Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Widget Description</b></em>'. <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.WidgetDescription#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.WidgetDescription#getLabelExpression <em>Label Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.WidgetDescription#getIdentifier <em>
+ * Identifier</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.WidgetDescription#getLabelExpression
+ * <em>Label Expression</em>}</li>
  * </ul>
  * </p>
  *
@@ -32,13 +34,14 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface WidgetDescription extends EObject {
     /**
-     * Returns the value of the '<em><b>Identifier</b></em>' attribute.
-     * <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Identifier</b></em>' attribute. <!--
+     * begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
-     * there really should be more of a description here...
+     * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there
+     * 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()
@@ -48,10 +51,13 @@ public interface WidgetDescription extends EObject {
     String getIdentifier();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.WidgetDescription#getIdentifier <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Identifier</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.WidgetDescription#getIdentifier
+     * <em>Identifier</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Identifier</em>' attribute.
      * @see #getIdentifier()
      * @generated
      */
@@ -65,19 +71,24 @@ public interface WidgetDescription extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
+     * 
      * @return the value of the '<em>Label Expression</em>' attribute.
      * @see #setLabelExpression(String)
      * @see org.eclipse.sirius.properties.PropertiesPackage#getWidgetDescription_LabelExpression()
-     * @model dataType="org.eclipse.sirius.viewpoint.description.InterpretedExpression"
+     * @model dataType=
+     *        "org.eclipse.sirius.viewpoint.description.InterpretedExpression"
      * @generated
      */
     String getLabelExpression();
 
     /**
-     * Sets the value of the '{@link org.eclipse.sirius.properties.WidgetDescription#getLabelExpression <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Label Expression</em>' attribute.
+     * Sets the value of the '
+     * {@link org.eclipse.sirius.properties.WidgetDescription#getLabelExpression
+     * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @param value
+     *            the new value of the '<em>Label Expression</em>' attribute.
      * @see #getLabelExpression()
      * @generated
      */
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
new file mode 100644
index 0000000000..320509bd40
--- /dev/null
+++ b/incubation/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/ButtonDescriptionImpl.java
@@ -0,0 +1,259 @@
+/**
+ * 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.ButtonDescription;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Button Description</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.ButtonDescriptionImpl#getButtonLabelExpression
+ * <em>Button Label Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.ButtonDescriptionImpl#getInitialOperation
+ * <em>Initial Operation</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ButtonDescriptionImpl extends WidgetDescriptionImpl implements ButtonDescription {
+    /**
+     * The default value of the '{@link #getButtonLabelExpression()
+     * <em>Button Label Expression</em>}' attribute. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @see #getButtonLabelExpression()
+     * @generated
+     * @ordered
+     */
+    protected static final String BUTTON_LABEL_EXPRESSION_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getButtonLabelExpression()
+     * <em>Button Label Expression</em>}' attribute. <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * 
+     * @see #getButtonLabelExpression()
+     * @generated
+     * @ordered
+     */
+    protected String buttonLabelExpression = BUTTON_LABEL_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;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    protected ButtonDescriptionImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    protected EClass eStaticClass() {
+        return PropertiesPackage.Literals.BUTTON_DESCRIPTION;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public String getButtonLabelExpression() {
+        return buttonLabelExpression;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public void setButtonLabelExpression(String newButtonLabelExpression) {
+        String oldButtonLabelExpression = buttonLabelExpression;
+        buttonLabelExpression = newButtonLabelExpression;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION, oldButtonLabelExpression, buttonLabelExpression));
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    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.BUTTON_DESCRIPTION__INITIAL_OPERATION, oldInitialOperation, newInitialOperation);
+            if (msgs == null)
+                msgs = notification;
+            else
+                msgs.add(notification);
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    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);
+            msgs = basicSetInitialOperation(newInitialOperation, msgs);
+            if (msgs != null)
+                msgs.dispatch();
+        } else if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION, newInitialOperation, newInitialOperation));
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+        case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
+            return basicSetInitialOperation(null, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+        case PropertiesPackage.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION:
+            return getButtonLabelExpression();
+        case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
+            return getInitialOperation();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+        case PropertiesPackage.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION:
+            setButtonLabelExpression((String) newValue);
+            return;
+        case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
+            setInitialOperation((InitialOperation) newValue);
+            return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case PropertiesPackage.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION:
+            setButtonLabelExpression(BUTTON_LABEL_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
+            setInitialOperation((InitialOperation) null);
+            return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    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);
+        case PropertiesPackage.BUTTON_DESCRIPTION__INITIAL_OPERATION:
+            return initialOperation != null;
+        }
+        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(" (buttonLabelExpression: ");
+        result.append(buttonLabelExpression);
+        result.append(')');
+        return result.toString();
+    }
+
+} // ButtonDescriptionImpl
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 bd3b7eca56..b2b07e7822 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
@@ -13,26 +13,25 @@ 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.CheckboxDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
-
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Checkbox Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Checkbox Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl#getValueExpression <em>Value Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl#getInitialOperation <em>Initial Operation</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl#getValueExpression
+ * <em>Value Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.CheckboxDescriptionImpl#getInitialOperation
+ * <em>Initial Operation</em>}</li>
  * </ul>
  * </p>
  *
@@ -40,9 +39,10 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  */
 public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements CheckboxDescription {
     /**
-     * The default value of the '{@link #getValueExpression() <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getValueExpression()
+     * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -50,9 +50,10 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
     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 -->
+     * The cached value of the '{@link #getValueExpression()
+     * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -60,9 +61,10 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
     protected String valueExpression = VALUE_EXPRESSION_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getInitialOperation() <em>Initial Operation</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getInitialOperation()
+     * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @see #getInitialOperation()
      * @generated
      * @ordered
@@ -70,8 +72,8 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
     protected InitialOperation initialOperation;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected CheckboxDescriptionImpl() {
@@ -79,8 +81,8 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -89,8 +91,8 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getValueExpression() {
@@ -98,8 +100,8 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setValueExpression(String newValueExpression) {
@@ -110,8 +112,8 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public InitialOperation getInitialOperation() {
@@ -119,8 +121,8 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public NotificationChain basicSetInitialOperation(InitialOperation newInitialOperation, NotificationChain msgs) {
@@ -128,120 +130,124 @@ 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) msgs = notification; else msgs.add(notification);
+            if (msgs == null)
+                msgs = notification;
+            else
+                msgs.add(notification);
         }
         return msgs;
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     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);
+                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);
+                msgs = ((InternalEObject) newInitialOperation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, null, msgs);
             msgs = basicSetInitialOperation(newInitialOperation, msgs);
-            if (msgs != null) msgs.dispatch();
-        }
-        else if (eNotificationRequired())
+            if (msgs != null)
+                msgs.dispatch();
+        } else if (eNotificationRequired())
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION, newInitialOperation, newInitialOperation));
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
-                return basicSetInitialOperation(null, msgs);
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
+            return basicSetInitialOperation(null, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
-                return getValueExpression();
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
-                return getInitialOperation();
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
+            return getValueExpression();
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
+            return getInitialOperation();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
-                setValueExpression((String)newValue);
-                return;
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
-                setInitialOperation((InitialOperation)newValue);
-                return;
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
+            setValueExpression((String) newValue);
+            return;
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
+            setInitialOperation((InitialOperation) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
-                setValueExpression(VALUE_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
-                setInitialOperation((InitialOperation)null);
-                return;
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
+            setValueExpression(VALUE_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
+            setInitialOperation((InitialOperation) null);
+            return;
         }
         super.eUnset(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     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);
-            case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
-                return initialOperation != null;
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION:
+            return VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
+        case PropertiesPackage.CHECKBOX_DESCRIPTION__INITIAL_OPERATION:
+            return initialOperation != null;
         }
         return super.eIsSet(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if (eIsProxy())
+            return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (valueExpression: ");
@@ -250,4 +256,4 @@ public class CheckboxDescriptionImpl extends WidgetDescriptionImpl implements Ch
         return result.toString();
     }
 
-} //CheckboxDescriptionImpl
+} // CheckboxDescriptionImpl
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 e5733e2d40..e42ca8295a 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
@@ -15,33 +15,33 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.DynamicMappingFor;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.WidgetDescription;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Container Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Container Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl#getWidgets <em>Widgets</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl#getDynamicMappings <em>Dynamic Mappings</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl#getIdentifier
+ * <em>Identifier</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl#getWidgets
+ * <em>Widgets</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.ContainerDescriptionImpl#getDynamicMappings
+ * <em>Dynamic Mappings</em>}</li>
  * </ul>
  * </p>
  *
@@ -49,9 +49,9 @@ import org.eclipse.sirius.properties.WidgetDescription;
  */
 public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container implements ContainerDescription {
     /**
-     * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getIdentifier() <em>Identifier</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -59,9 +59,9 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     protected static final String IDENTIFIER_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -69,9 +69,9 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     protected String identifier = IDENTIFIER_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getWidgets() <em>Widgets</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getWidgets() <em>Widgets</em>}'
+     * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getWidgets()
      * @generated
      * @ordered
@@ -79,9 +79,10 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     protected EList<WidgetDescription> widgets;
 
     /**
-     * The cached value of the '{@link #getDynamicMappings() <em>Dynamic Mappings</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getDynamicMappings()
+     * <em>Dynamic Mappings</em>}' containment reference list. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getDynamicMappings()
      * @generated
      * @ordered
@@ -89,8 +90,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     protected EList<DynamicMappingFor> dynamicMappings;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected ContainerDescriptionImpl() {
@@ -98,8 +99,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -108,8 +109,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getIdentifier() {
@@ -117,8 +118,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setIdentifier(String newIdentifier) {
@@ -129,8 +130,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EList<WidgetDescription> getWidgets() {
@@ -141,8 +142,8 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EList<DynamicMappingFor> getDynamicMappings() {
@@ -153,110 +154,111 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
-            case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
-                return ((InternalEList<?>)getWidgets()).basicRemove(otherEnd, msgs);
-            case PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS:
-                return ((InternalEList<?>)getDynamicMappings()).basicRemove(otherEnd, msgs);
+        case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
+            return ((InternalEList<?>) getWidgets()).basicRemove(otherEnd, msgs);
+        case PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS:
+            return ((InternalEList<?>) getDynamicMappings()).basicRemove(otherEnd, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER:
-                return getIdentifier();
-            case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
-                return getWidgets();
-            case PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS:
-                return getDynamicMappings();
+        case PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER:
+            return getIdentifier();
+        case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
+            return getWidgets();
+        case PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS:
+            return getDynamicMappings();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @SuppressWarnings("unchecked")
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER:
-                setIdentifier((String)newValue);
-                return;
-            case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
-                getWidgets().clear();
-                getWidgets().addAll((Collection<? extends WidgetDescription>)newValue);
-                return;
-            case PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS:
-                getDynamicMappings().clear();
-                getDynamicMappings().addAll((Collection<? extends DynamicMappingFor>)newValue);
-                return;
+        case PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER:
+            setIdentifier((String) newValue);
+            return;
+        case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
+            getWidgets().clear();
+            getWidgets().addAll((Collection<? extends WidgetDescription>) newValue);
+            return;
+        case PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS:
+            getDynamicMappings().clear();
+            getDynamicMappings().addAll((Collection<? extends DynamicMappingFor>) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER:
-                setIdentifier(IDENTIFIER_EDEFAULT);
-                return;
-            case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
-                getWidgets().clear();
-                return;
-            case PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS:
-                getDynamicMappings().clear();
-                return;
+        case PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER:
+            setIdentifier(IDENTIFIER_EDEFAULT);
+            return;
+        case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
+            getWidgets().clear();
+            return;
+        case PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS:
+            getDynamicMappings().clear();
+            return;
         }
         super.eUnset(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER:
-                return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
-            case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
-                return widgets != null && !widgets.isEmpty();
-            case PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS:
-                return dynamicMappings != null && !dynamicMappings.isEmpty();
+        case PropertiesPackage.CONTAINER_DESCRIPTION__IDENTIFIER:
+            return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
+        case PropertiesPackage.CONTAINER_DESCRIPTION__WIDGETS:
+            return widgets != null && !widgets.isEmpty();
+        case PropertiesPackage.CONTAINER_DESCRIPTION__DYNAMIC_MAPPINGS:
+            return dynamicMappings != null && !dynamicMappings.isEmpty();
         }
         return super.eIsSet(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if (eIsProxy())
+            return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (identifier: ");
@@ -265,4 +267,4 @@ public class ContainerDescriptionImpl extends MinimalEObjectImpl.Container imple
         return result.toString();
     }
 
-} //ContainerDescriptionImpl
+} // ContainerDescriptionImpl
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 091700871e..2519894fb5 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
@@ -13,26 +13,26 @@ 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.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.sirius.properties.DynamicMappingCase;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.WidgetDescription;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dynamic Mapping Case</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Dynamic Mapping Case</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.impl.DynamicMappingCaseImpl#getCaseExpression <em>Case Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.DynamicMappingCaseImpl#getWidget <em>Widget</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.DynamicMappingCaseImpl#getCaseExpression
+ * <em>Case Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.DynamicMappingCaseImpl#getWidget
+ * <em>Widget</em>}</li>
  * </ul>
  * </p>
  *
@@ -40,9 +40,10 @@ import org.eclipse.sirius.properties.WidgetDescription;
  */
 public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container implements DynamicMappingCase {
     /**
-     * The default value of the '{@link #getCaseExpression() <em>Case Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getCaseExpression()
+     * <em>Case Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getCaseExpression()
      * @generated
      * @ordered
@@ -50,9 +51,10 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
     protected static final String CASE_EXPRESSION_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getCaseExpression() <em>Case Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getCaseExpression()
+     * <em>Case Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getCaseExpression()
      * @generated
      * @ordered
@@ -60,9 +62,9 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
     protected String caseExpression = CASE_EXPRESSION_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getWidget() <em>Widget</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getWidget() <em>Widget</em>}'
+     * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getWidget()
      * @generated
      * @ordered
@@ -70,8 +72,8 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
     protected WidgetDescription widget;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected DynamicMappingCaseImpl() {
@@ -79,8 +81,8 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -89,8 +91,8 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getCaseExpression() {
@@ -98,8 +100,8 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setCaseExpression(String newCaseExpression) {
@@ -110,8 +112,8 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public WidgetDescription getWidget() {
@@ -119,8 +121,8 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public NotificationChain basicSetWidget(WidgetDescription newWidget, NotificationChain msgs) {
@@ -128,120 +130,124 @@ 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) msgs = notification; else msgs.add(notification);
+            if (msgs == null)
+                msgs = notification;
+            else
+                msgs.add(notification);
         }
         return msgs;
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     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);
+                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);
+                msgs = ((InternalEObject) newWidget).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET, null, msgs);
             msgs = basicSetWidget(newWidget, msgs);
-            if (msgs != null) msgs.dispatch();
-        }
-        else if (eNotificationRequired())
+            if (msgs != null)
+                msgs.dispatch();
+        } else if (eNotificationRequired())
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET, newWidget, newWidget));
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
-            case PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET:
-                return basicSetWidget(null, msgs);
+        case PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET:
+            return basicSetWidget(null, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case PropertiesPackage.DYNAMIC_MAPPING_CASE__CASE_EXPRESSION:
-                return getCaseExpression();
-            case PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET:
-                return getWidget();
+        case PropertiesPackage.DYNAMIC_MAPPING_CASE__CASE_EXPRESSION:
+            return getCaseExpression();
+        case PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET:
+            return getWidget();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case PropertiesPackage.DYNAMIC_MAPPING_CASE__CASE_EXPRESSION:
-                setCaseExpression((String)newValue);
-                return;
-            case PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET:
-                setWidget((WidgetDescription)newValue);
-                return;
+        case PropertiesPackage.DYNAMIC_MAPPING_CASE__CASE_EXPRESSION:
+            setCaseExpression((String) newValue);
+            return;
+        case PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET:
+            setWidget((WidgetDescription) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.DYNAMIC_MAPPING_CASE__CASE_EXPRESSION:
-                setCaseExpression(CASE_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET:
-                setWidget((WidgetDescription)null);
-                return;
+        case PropertiesPackage.DYNAMIC_MAPPING_CASE__CASE_EXPRESSION:
+            setCaseExpression(CASE_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET:
+            setWidget((WidgetDescription) null);
+            return;
         }
         super.eUnset(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     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);
-            case PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET:
-                return widget != null;
+        case PropertiesPackage.DYNAMIC_MAPPING_CASE__CASE_EXPRESSION:
+            return CASE_EXPRESSION_EDEFAULT == null ? caseExpression != null : !CASE_EXPRESSION_EDEFAULT.equals(caseExpression);
+        case PropertiesPackage.DYNAMIC_MAPPING_CASE__WIDGET:
+            return widget != null;
         }
         return super.eIsSet(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if (eIsProxy())
+            return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (caseExpression: ");
@@ -250,4 +256,4 @@ public class DynamicMappingCaseImpl extends MinimalEObjectImpl.Container impleme
         return result.toString();
     }
 
-} //DynamicMappingCaseImpl
+} // DynamicMappingCaseImpl
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 178bdd3a16..ff1d25aba4 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
@@ -13,27 +13,29 @@ 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.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.sirius.properties.DynamicMappingFor;
 import org.eclipse.sirius.properties.DynamicMappingSwitch;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dynamic Mapping For</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Dynamic Mapping For</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl#getIterator <em>Iterator</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl#getDomainClassExpression <em>Domain Class Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl#getSwitch <em>Switch</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl#getIterator
+ * <em>Iterator</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl#getDomainClassExpression
+ * <em>Domain Class Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.DynamicMappingForImpl#getSwitch
+ * <em>Switch</em>}</li>
  * </ul>
  * </p>
  *
@@ -41,9 +43,9 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  */
 public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implements DynamicMappingFor {
     /**
-     * The default value of the '{@link #getIterator() <em>Iterator</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getIterator() <em>Iterator</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getIterator()
      * @generated
      * @ordered
@@ -51,9 +53,9 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     protected static final String ITERATOR_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getIterator() <em>Iterator</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getIterator() <em>Iterator</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getIterator()
      * @generated
      * @ordered
@@ -61,9 +63,10 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     protected String iterator = ITERATOR_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getDomainClassExpression() <em>Domain Class Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
+     * The default value of the '{@link #getDomainClassExpression()
+     * <em>Domain Class Expression</em>}' attribute. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @see #getDomainClassExpression()
      * @generated
      * @ordered
@@ -71,9 +74,10 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     protected static final String DOMAIN_CLASS_EXPRESSION_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getDomainClassExpression() <em>Domain Class Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
+     * The cached value of the '{@link #getDomainClassExpression()
+     * <em>Domain Class Expression</em>}' attribute. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @see #getDomainClassExpression()
      * @generated
      * @ordered
@@ -81,9 +85,9 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     protected String domainClassExpression = DOMAIN_CLASS_EXPRESSION_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getSwitch() <em>Switch</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getSwitch() <em>Switch</em>}'
+     * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getSwitch()
      * @generated
      * @ordered
@@ -91,8 +95,8 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     protected DynamicMappingSwitch switch_;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected DynamicMappingForImpl() {
@@ -100,8 +104,8 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -110,8 +114,8 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getIterator() {
@@ -119,8 +123,8 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setIterator(String newIterator) {
@@ -131,8 +135,8 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getDomainClassExpression() {
@@ -140,8 +144,8 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setDomainClassExpression(String newDomainClassExpression) {
@@ -152,8 +156,8 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public DynamicMappingSwitch getSwitch() {
@@ -161,8 +165,8 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public NotificationChain basicSetSwitch(DynamicMappingSwitch newSwitch, NotificationChain msgs) {
@@ -170,130 +174,134 @@ 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) msgs = notification; else msgs.add(notification);
+            if (msgs == null)
+                msgs = notification;
+            else
+                msgs.add(notification);
         }
         return msgs;
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     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);
+                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);
+                msgs = ((InternalEObject) newSwitch).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH, null, msgs);
             msgs = basicSetSwitch(newSwitch, msgs);
-            if (msgs != null) msgs.dispatch();
-        }
-        else if (eNotificationRequired())
+            if (msgs != null)
+                msgs.dispatch();
+        } else if (eNotificationRequired())
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH, newSwitch, newSwitch));
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH:
-                return basicSetSwitch(null, msgs);
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH:
+            return basicSetSwitch(null, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR:
-                return getIterator();
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION:
-                return getDomainClassExpression();
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH:
-                return getSwitch();
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR:
+            return getIterator();
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION:
+            return getDomainClassExpression();
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH:
+            return getSwitch();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR:
-                setIterator((String)newValue);
-                return;
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION:
-                setDomainClassExpression((String)newValue);
-                return;
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH:
-                setSwitch((DynamicMappingSwitch)newValue);
-                return;
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR:
+            setIterator((String) newValue);
+            return;
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION:
+            setDomainClassExpression((String) newValue);
+            return;
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH:
+            setSwitch((DynamicMappingSwitch) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR:
-                setIterator(ITERATOR_EDEFAULT);
-                return;
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION:
-                setDomainClassExpression(DOMAIN_CLASS_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH:
-                setSwitch((DynamicMappingSwitch)null);
-                return;
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR:
+            setIterator(ITERATOR_EDEFAULT);
+            return;
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__DOMAIN_CLASS_EXPRESSION:
+            setDomainClassExpression(DOMAIN_CLASS_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH:
+            setSwitch((DynamicMappingSwitch) null);
+            return;
         }
         super.eUnset(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR:
-                return ITERATOR_EDEFAULT == null ? iterator != null : !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);
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH:
-                return switch_ != null;
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__ITERATOR:
+            return ITERATOR_EDEFAULT == null ? iterator != null : !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);
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR__SWITCH:
+            return switch_ != null;
         }
         return super.eIsSet(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if (eIsProxy())
+            return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (iterator: ");
@@ -304,4 +312,4 @@ public class DynamicMappingForImpl extends MinimalEObjectImpl.Container implemen
         return result.toString();
     }
 
-} //DynamicMappingForImpl
+} // DynamicMappingForImpl
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 810894ca31..4738c2e79e 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
@@ -15,31 +15,29 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.sirius.properties.DynamicMappingCase;
 import org.eclipse.sirius.properties.DynamicMappingSwitch;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dynamic Mapping Switch</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Dynamic Mapping Switch</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.impl.DynamicMappingSwitchImpl#getSwitchExpression <em>Switch Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.DynamicMappingSwitchImpl#getCases <em>Cases</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.DynamicMappingSwitchImpl#getSwitchExpression
+ * <em>Switch Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.DynamicMappingSwitchImpl#getCases
+ * <em>Cases</em>}</li>
  * </ul>
  * </p>
  *
@@ -47,9 +45,10 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  */
 public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container implements DynamicMappingSwitch {
     /**
-     * The default value of the '{@link #getSwitchExpression() <em>Switch Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getSwitchExpression()
+     * <em>Switch Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getSwitchExpression()
      * @generated
      * @ordered
@@ -57,9 +56,10 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
     protected static final String SWITCH_EXPRESSION_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getSwitchExpression() <em>Switch Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getSwitchExpression()
+     * <em>Switch Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getSwitchExpression()
      * @generated
      * @ordered
@@ -67,9 +67,9 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
     protected String switchExpression = SWITCH_EXPRESSION_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getCases() <em>Cases</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getCases() <em>Cases</em>}' containment
+     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getCases()
      * @generated
      * @ordered
@@ -77,8 +77,8 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
     protected EList<DynamicMappingCase> cases;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected DynamicMappingSwitchImpl() {
@@ -86,8 +86,8 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -96,8 +96,8 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getSwitchExpression() {
@@ -105,8 +105,8 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setSwitchExpression(String newSwitchExpression) {
@@ -117,8 +117,8 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EList<DynamicMappingCase> getCases() {
@@ -129,97 +129,98 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
-            case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES:
-                return ((InternalEList<?>)getCases()).basicRemove(otherEnd, msgs);
+        case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES:
+            return ((InternalEList<?>) getCases()).basicRemove(otherEnd, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION:
-                return getSwitchExpression();
-            case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES:
-                return getCases();
+        case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION:
+            return getSwitchExpression();
+        case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES:
+            return getCases();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @SuppressWarnings("unchecked")
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION:
-                setSwitchExpression((String)newValue);
-                return;
-            case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES:
-                getCases().clear();
-                getCases().addAll((Collection<? extends DynamicMappingCase>)newValue);
-                return;
+        case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION:
+            setSwitchExpression((String) newValue);
+            return;
+        case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES:
+            getCases().clear();
+            getCases().addAll((Collection<? extends DynamicMappingCase>) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION:
-                setSwitchExpression(SWITCH_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES:
-                getCases().clear();
-                return;
+        case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION:
+            setSwitchExpression(SWITCH_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES:
+            getCases().clear();
+            return;
         }
         super.eUnset(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     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);
-            case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES:
-                return cases != null && !cases.isEmpty();
+        case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__SWITCH_EXPRESSION:
+            return SWITCH_EXPRESSION_EDEFAULT == null ? switchExpression != null : !SWITCH_EXPRESSION_EDEFAULT.equals(switchExpression);
+        case PropertiesPackage.DYNAMIC_MAPPING_SWITCH__CASES:
+            return cases != null && !cases.isEmpty();
         }
         return super.eIsSet(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if (eIsProxy())
+            return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (switchExpression: ");
@@ -228,4 +229,4 @@ public class DynamicMappingSwitchImpl extends MinimalEObjectImpl.Container imple
         return result.toString();
     }
 
-} //DynamicMappingSwitchImpl
+} // DynamicMappingSwitchImpl
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 7187ac6e8e..f300409831 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
@@ -13,29 +13,35 @@ 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.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Group Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Group Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl#getLabelExpression <em>Label Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl#getDomainClass <em>Domain Class</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl#getSemanticCandidateExpression <em>Semantic Candidate Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl#getContainer <em>Container</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl#getIdentifier
+ * <em>Identifier</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl#getLabelExpression
+ * <em>Label Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl#getDomainClass
+ * <em>Domain Class</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl#getSemanticCandidateExpression
+ * <em>Semantic Candidate Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.GroupDescriptionImpl#getContainer
+ * <em>Container</em>}</li>
  * </ul>
  * </p>
  *
@@ -43,9 +49,9 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  */
 public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implements GroupDescription {
     /**
-     * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getIdentifier() <em>Identifier</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -53,9 +59,9 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     protected static final String IDENTIFIER_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -63,9 +69,10 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     protected String identifier = IDENTIFIER_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getLabelExpression()
+     * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -73,9 +80,10 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     protected static final String LABEL_EXPRESSION_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getLabelExpression()
+     * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -83,9 +91,9 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     protected String labelExpression = LABEL_EXPRESSION_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getDomainClass() <em>Domain Class</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getDomainClass() <em>Domain Class</em>}
+     * ' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getDomainClass()
      * @generated
      * @ordered
@@ -93,9 +101,9 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     protected static final String DOMAIN_CLASS_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getDomainClass() <em>Domain Class</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getDomainClass() <em>Domain Class</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getDomainClass()
      * @generated
      * @ordered
@@ -103,9 +111,10 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     protected String domainClass = DOMAIN_CLASS_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getSemanticCandidateExpression() <em>Semantic Candidate Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getSemanticCandidateExpression()
+     * <em>Semantic Candidate Expression</em>}' attribute. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @see #getSemanticCandidateExpression()
      * @generated
      * @ordered
@@ -113,9 +122,10 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     protected static final String SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getSemanticCandidateExpression() <em>Semantic Candidate Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getSemanticCandidateExpression()
+     * <em>Semantic Candidate Expression</em>}' attribute. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @see #getSemanticCandidateExpression()
      * @generated
      * @ordered
@@ -123,9 +133,9 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     protected String semanticCandidateExpression = SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getContainer() <em>Container</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getContainer() <em>Container</em>}'
+     * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getContainer()
      * @generated
      * @ordered
@@ -133,8 +143,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     protected ContainerDescription container;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected GroupDescriptionImpl() {
@@ -142,8 +152,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -152,8 +162,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getIdentifier() {
@@ -161,8 +171,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setIdentifier(String newIdentifier) {
@@ -173,8 +183,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getLabelExpression() {
@@ -182,8 +192,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setLabelExpression(String newLabelExpression) {
@@ -194,8 +204,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getDomainClass() {
@@ -203,8 +213,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setDomainClass(String newDomainClass) {
@@ -215,8 +225,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getSemanticCandidateExpression() {
@@ -224,8 +234,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setSemanticCandidateExpression(String newSemanticCandidateExpression) {
@@ -236,8 +246,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public ContainerDescription getContainer() {
@@ -245,8 +255,8 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public NotificationChain basicSetContainer(ContainerDescription newContainer, NotificationChain msgs) {
@@ -254,150 +264,154 @@ 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) msgs = notification; else msgs.add(notification);
+            if (msgs == null)
+                msgs = notification;
+            else
+                msgs.add(notification);
         }
         return msgs;
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     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);
+                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);
+                msgs = ((InternalEObject) newContainer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.GROUP_DESCRIPTION__CONTAINER, null, msgs);
             msgs = basicSetContainer(newContainer, msgs);
-            if (msgs != null) msgs.dispatch();
-        }
-        else if (eNotificationRequired())
+            if (msgs != null)
+                msgs.dispatch();
+        } else if (eNotificationRequired())
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.GROUP_DESCRIPTION__CONTAINER, newContainer, newContainer));
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
-            case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
-                return basicSetContainer(null, msgs);
+        case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
+            return basicSetContainer(null, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER:
-                return getIdentifier();
-            case PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION:
-                return getLabelExpression();
-            case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
-                return getDomainClass();
-            case PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-                return getSemanticCandidateExpression();
-            case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
-                return getContainer();
+        case PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER:
+            return getIdentifier();
+        case PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION:
+            return getLabelExpression();
+        case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
+            return getDomainClass();
+        case PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
+            return getSemanticCandidateExpression();
+        case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
+            return getContainer();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER:
-                setIdentifier((String)newValue);
-                return;
-            case PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION:
-                setLabelExpression((String)newValue);
-                return;
-            case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
-                setDomainClass((String)newValue);
-                return;
-            case PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-                setSemanticCandidateExpression((String)newValue);
-                return;
-            case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
-                setContainer((ContainerDescription)newValue);
-                return;
+        case PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER:
+            setIdentifier((String) newValue);
+            return;
+        case PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION:
+            setLabelExpression((String) newValue);
+            return;
+        case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
+            setDomainClass((String) newValue);
+            return;
+        case PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
+            setSemanticCandidateExpression((String) newValue);
+            return;
+        case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
+            setContainer((ContainerDescription) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER:
-                setIdentifier(IDENTIFIER_EDEFAULT);
-                return;
-            case PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION:
-                setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
-                setDomainClass(DOMAIN_CLASS_EDEFAULT);
-                return;
-            case PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-                setSemanticCandidateExpression(SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
-                setContainer((ContainerDescription)null);
-                return;
+        case PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER:
+            setIdentifier(IDENTIFIER_EDEFAULT);
+            return;
+        case PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION:
+            setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
+            setDomainClass(DOMAIN_CLASS_EDEFAULT);
+            return;
+        case PropertiesPackage.GROUP_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
+            setSemanticCandidateExpression(SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
+            setContainer((ContainerDescription) null);
+            return;
         }
         super.eUnset(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER:
-                return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
-            case PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION:
-                return LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
-            case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
-                return DOMAIN_CLASS_EDEFAULT == null ? domainClass != null : !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);
-            case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
-                return container != null;
+        case PropertiesPackage.GROUP_DESCRIPTION__IDENTIFIER:
+            return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
+        case PropertiesPackage.GROUP_DESCRIPTION__LABEL_EXPRESSION:
+            return LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
+        case PropertiesPackage.GROUP_DESCRIPTION__DOMAIN_CLASS:
+            return DOMAIN_CLASS_EDEFAULT == null ? domainClass != null : !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);
+        case PropertiesPackage.GROUP_DESCRIPTION__CONTAINER:
+            return container != null;
         }
         return super.eIsSet(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if (eIsProxy())
+            return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (identifier: ");
@@ -412,4 +426,4 @@ public class GroupDescriptionImpl extends MinimalEObjectImpl.Container implement
         return result.toString();
     }
 
-} //GroupDescriptionImpl
+} // GroupDescriptionImpl
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 ea94f3c543..eb868f752c 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
@@ -12,14 +12,12 @@
 package org.eclipse.sirius.properties.impl;
 
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.sirius.properties.LabelDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Label Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Label Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
  *
@@ -27,8 +25,8 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  */
 public class LabelDescriptionImpl extends WidgetDescriptionImpl implements LabelDescription {
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected LabelDescriptionImpl() {
@@ -36,8 +34,8 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -45,4 +43,4 @@ public class LabelDescriptionImpl extends WidgetDescriptionImpl implements Label
         return PropertiesPackage.Literals.LABEL_DESCRIPTION;
     }
 
-} //LabelDescriptionImpl
+} // LabelDescriptionImpl
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 a78d9e5c87..c0f9176773 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
@@ -14,32 +14,35 @@ package org.eclipse.sirius.properties.impl;
 import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Page Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Page Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.impl.PageDescriptionImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.PageDescriptionImpl#getLabelExpression <em>Label Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.PageDescriptionImpl#getDomainClass <em>Domain Class</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.PageDescriptionImpl#getSemanticCandidateExpression <em>Semantic Candidate Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.PageDescriptionImpl#getGroups <em>Groups</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.PageDescriptionImpl#getIdentifier
+ * <em>Identifier</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.PageDescriptionImpl#getLabelExpression
+ * <em>Label Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.PageDescriptionImpl#getDomainClass
+ * <em>Domain Class</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.PageDescriptionImpl#getSemanticCandidateExpression
+ * <em>Semantic Candidate Expression</em>}</li>
+ * <li>{@link org.eclipse.sirius.properties.impl.PageDescriptionImpl#getGroups
+ * <em>Groups</em>}</li>
  * </ul>
  * </p>
  *
@@ -47,9 +50,9 @@ import org.eclipse.sirius.properties.PropertiesPackage;
  */
 public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements PageDescription {
     /**
-     * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getIdentifier() <em>Identifier</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -57,9 +60,9 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     protected static final String IDENTIFIER_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -67,9 +70,10 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     protected String identifier = IDENTIFIER_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getLabelExpression()
+     * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -77,9 +81,10 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     protected static final String LABEL_EXPRESSION_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getLabelExpression()
+     * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -87,9 +92,9 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     protected String labelExpression = LABEL_EXPRESSION_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getDomainClass() <em>Domain Class</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getDomainClass() <em>Domain Class</em>}
+     * ' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getDomainClass()
      * @generated
      * @ordered
@@ -97,9 +102,9 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     protected static final String DOMAIN_CLASS_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getDomainClass() <em>Domain Class</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getDomainClass() <em>Domain Class</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getDomainClass()
      * @generated
      * @ordered
@@ -107,9 +112,10 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     protected String domainClass = DOMAIN_CLASS_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getSemanticCandidateExpression() <em>Semantic Candidate Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getSemanticCandidateExpression()
+     * <em>Semantic Candidate Expression</em>}' attribute. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @see #getSemanticCandidateExpression()
      * @generated
      * @ordered
@@ -117,9 +123,10 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     protected static final String SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getSemanticCandidateExpression() <em>Semantic Candidate Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getSemanticCandidateExpression()
+     * <em>Semantic Candidate Expression</em>}' attribute. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @see #getSemanticCandidateExpression()
      * @generated
      * @ordered
@@ -127,9 +134,9 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     protected String semanticCandidateExpression = SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getGroups() <em>Groups</em>}' reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getGroups() <em>Groups</em>}' reference
+     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getGroups()
      * @generated
      * @ordered
@@ -137,8 +144,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     protected EList<GroupDescription> groups;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected PageDescriptionImpl() {
@@ -146,8 +153,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -156,8 +163,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getIdentifier() {
@@ -165,8 +172,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setIdentifier(String newIdentifier) {
@@ -177,8 +184,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getLabelExpression() {
@@ -186,8 +193,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setLabelExpression(String newLabelExpression) {
@@ -198,8 +205,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getDomainClass() {
@@ -207,8 +214,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setDomainClass(String newDomainClass) {
@@ -219,8 +226,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getSemanticCandidateExpression() {
@@ -228,8 +235,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setSemanticCandidateExpression(String newSemanticCandidateExpression) {
@@ -240,8 +247,8 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EList<GroupDescription> getGroups() {
@@ -252,113 +259,114 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER:
-                return getIdentifier();
-            case PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION:
-                return getLabelExpression();
-            case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
-                return getDomainClass();
-            case PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-                return getSemanticCandidateExpression();
-            case PropertiesPackage.PAGE_DESCRIPTION__GROUPS:
-                return getGroups();
+        case PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER:
+            return getIdentifier();
+        case PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION:
+            return getLabelExpression();
+        case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
+            return getDomainClass();
+        case PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
+            return getSemanticCandidateExpression();
+        case PropertiesPackage.PAGE_DESCRIPTION__GROUPS:
+            return getGroups();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @SuppressWarnings("unchecked")
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER:
-                setIdentifier((String)newValue);
-                return;
-            case PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION:
-                setLabelExpression((String)newValue);
-                return;
-            case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
-                setDomainClass((String)newValue);
-                return;
-            case PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-                setSemanticCandidateExpression((String)newValue);
-                return;
-            case PropertiesPackage.PAGE_DESCRIPTION__GROUPS:
-                getGroups().clear();
-                getGroups().addAll((Collection<? extends GroupDescription>)newValue);
-                return;
+        case PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER:
+            setIdentifier((String) newValue);
+            return;
+        case PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION:
+            setLabelExpression((String) newValue);
+            return;
+        case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
+            setDomainClass((String) newValue);
+            return;
+        case PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
+            setSemanticCandidateExpression((String) newValue);
+            return;
+        case PropertiesPackage.PAGE_DESCRIPTION__GROUPS:
+            getGroups().clear();
+            getGroups().addAll((Collection<? extends GroupDescription>) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER:
-                setIdentifier(IDENTIFIER_EDEFAULT);
-                return;
-            case PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION:
-                setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
-                setDomainClass(DOMAIN_CLASS_EDEFAULT);
-                return;
-            case PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
-                setSemanticCandidateExpression(SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.PAGE_DESCRIPTION__GROUPS:
-                getGroups().clear();
-                return;
+        case PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER:
+            setIdentifier(IDENTIFIER_EDEFAULT);
+            return;
+        case PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION:
+            setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
+            setDomainClass(DOMAIN_CLASS_EDEFAULT);
+            return;
+        case PropertiesPackage.PAGE_DESCRIPTION__SEMANTIC_CANDIDATE_EXPRESSION:
+            setSemanticCandidateExpression(SEMANTIC_CANDIDATE_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.PAGE_DESCRIPTION__GROUPS:
+            getGroups().clear();
+            return;
         }
         super.eUnset(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER:
-                return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
-            case PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION:
-                return LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
-            case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
-                return DOMAIN_CLASS_EDEFAULT == null ? domainClass != null : !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);
-            case PropertiesPackage.PAGE_DESCRIPTION__GROUPS:
-                return groups != null && !groups.isEmpty();
+        case PropertiesPackage.PAGE_DESCRIPTION__IDENTIFIER:
+            return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
+        case PropertiesPackage.PAGE_DESCRIPTION__LABEL_EXPRESSION:
+            return LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
+        case PropertiesPackage.PAGE_DESCRIPTION__DOMAIN_CLASS:
+            return DOMAIN_CLASS_EDEFAULT == null ? domainClass != null : !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);
+        case PropertiesPackage.PAGE_DESCRIPTION__GROUPS:
+            return groups != null && !groups.isEmpty();
         }
         return super.eIsSet(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if (eIsProxy())
+            return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (identifier: ");
@@ -373,4 +381,4 @@ public class PageDescriptionImpl extends MinimalEObjectImpl.Container implements
         return result.toString();
     }
 
-} //PageDescriptionImpl
+} // PageDescriptionImpl
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 e232d949cf..f7ff92dc2a 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
@@ -14,43 +14,52 @@ package org.eclipse.sirius.properties.impl;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.sirius.properties.*;
+import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.ContainerDescription;
+import org.eclipse.sirius.properties.DynamicMappingCase;
+import org.eclipse.sirius.properties.DynamicMappingFor;
+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.PropertiesFactory;
+import org.eclipse.sirius.properties.PropertiesPackage;
+import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.ViewExtensionDescription;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFactory {
     /**
-     * Creates the default factory implementation.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Creates the default factory implementation. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     public static PropertiesFactory init() {
         try {
-            PropertiesFactory thePropertiesFactory = (PropertiesFactory)EPackage.Registry.INSTANCE.getEFactory(PropertiesPackage.eNS_URI);
+            PropertiesFactory thePropertiesFactory = (PropertiesFactory) EPackage.Registry.INSTANCE.getEFactory(PropertiesPackage.eNS_URI);
             if (thePropertiesFactory != null) {
                 return thePropertiesFactory;
             }
-        }
-        catch (Exception exception) {
+        } catch (Exception exception) {
             EcorePlugin.INSTANCE.log(exception);
         }
         return new PropertiesFactoryImpl();
     }
 
     /**
-     * Creates an instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Creates an instance of the factory. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     public PropertiesFactoryImpl() {
@@ -58,32 +67,45 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public EObject create(EClass eClass) {
         switch (eClass.getClassifierID()) {
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION: return createViewExtensionDescription();
-            case PropertiesPackage.PAGE_DESCRIPTION: return createPageDescription();
-            case PropertiesPackage.GROUP_DESCRIPTION: return createGroupDescription();
-            case PropertiesPackage.CONTAINER_DESCRIPTION: return createContainerDescription();
-            case PropertiesPackage.TEXT_DESCRIPTION: return createTextDescription();
-            case PropertiesPackage.LABEL_DESCRIPTION: return createLabelDescription();
-            case PropertiesPackage.CHECKBOX_DESCRIPTION: return createCheckboxDescription();
-            case PropertiesPackage.SELECT_DESCRIPTION: return createSelectDescription();
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR: return createDynamicMappingFor();
-            case PropertiesPackage.DYNAMIC_MAPPING_SWITCH: return createDynamicMappingSwitch();
-            case PropertiesPackage.DYNAMIC_MAPPING_CASE: return createDynamicMappingCase();
-            default:
-                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION:
+            return createViewExtensionDescription();
+        case PropertiesPackage.PAGE_DESCRIPTION:
+            return createPageDescription();
+        case PropertiesPackage.GROUP_DESCRIPTION:
+            return createGroupDescription();
+        case PropertiesPackage.CONTAINER_DESCRIPTION:
+            return createContainerDescription();
+        case PropertiesPackage.TEXT_DESCRIPTION:
+            return createTextDescription();
+        case PropertiesPackage.BUTTON_DESCRIPTION:
+            return createButtonDescription();
+        case PropertiesPackage.LABEL_DESCRIPTION:
+            return createLabelDescription();
+        case PropertiesPackage.CHECKBOX_DESCRIPTION:
+            return createCheckboxDescription();
+        case PropertiesPackage.SELECT_DESCRIPTION:
+            return createSelectDescription();
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR:
+            return createDynamicMappingFor();
+        case PropertiesPackage.DYNAMIC_MAPPING_SWITCH:
+            return createDynamicMappingSwitch();
+        case PropertiesPackage.DYNAMIC_MAPPING_CASE:
+            return createDynamicMappingCase();
+        default:
+            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
         }
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public ViewExtensionDescription createViewExtensionDescription() {
@@ -92,8 +114,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public PageDescription createPageDescription() {
@@ -102,8 +124,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public GroupDescription createGroupDescription() {
@@ -112,8 +134,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public ContainerDescription createContainerDescription() {
@@ -122,8 +144,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public TextDescription createTextDescription() {
@@ -132,8 +154,18 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public ButtonDescription createButtonDescription() {
+        ButtonDescriptionImpl buttonDescription = new ButtonDescriptionImpl();
+        return buttonDescription;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public LabelDescription createLabelDescription() {
@@ -142,8 +174,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public CheckboxDescription createCheckboxDescription() {
@@ -152,8 +184,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public SelectDescription createSelectDescription() {
@@ -162,8 +194,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public DynamicMappingFor createDynamicMappingFor() {
@@ -172,8 +204,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public DynamicMappingSwitch createDynamicMappingSwitch() {
@@ -182,8 +214,8 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public DynamicMappingCase createDynamicMappingCase() {
@@ -192,17 +224,17 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public PropertiesPackage getPropertiesPackage() {
-        return (PropertiesPackage)getEPackage();
+        return (PropertiesPackage) getEPackage();
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @deprecated
      * @generated
      */
@@ -211,4 +243,4 @@ public class PropertiesFactoryImpl extends EFactoryImpl implements PropertiesFac
         return PropertiesPackage.eINSTANCE;
     }
 
-} //PropertiesFactoryImpl
+} // PropertiesFactoryImpl
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 a67a1a6f0d..c7ea7bcb3d 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
@@ -16,9 +16,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
+import org.eclipse.sirius.properties.ButtonDescription;
 import org.eclipse.sirius.properties.CheckboxDescription;
 import org.eclipse.sirius.properties.ContainerDescription;
 import org.eclipse.sirius.properties.DynamicMappingCase;
@@ -33,114 +32,118 @@ import org.eclipse.sirius.properties.SelectDescription;
 import org.eclipse.sirius.properties.TextDescription;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 import org.eclipse.sirius.properties.WidgetDescription;
-
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
-
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
-
 import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
+ * end-user-doc -->
+ * 
  * @generated
  */
 public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPackage {
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private EClass viewExtensionDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private EClass pageDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private EClass groupDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private EClass containerDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private EClass widgetDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private EClass textDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    private EClass buttonDescriptionEClass = null;
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private EClass labelDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private EClass checkboxDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private EClass selectDescriptionEClass = null;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private EClass dynamicMappingForEClass = null;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private EClass dynamicMappingSwitchEClass = null;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private EClass dynamicMappingCaseEClass = 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.
-     * <p>Note: the correct way to create the package is via the static
-     * factory 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 -->
+     * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+     * package package URI value.
+     * <p>
+     * Note: the correct way to create the package is via the static factory
+     * 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()
@@ -151,29 +154,34 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private static boolean isInited = false;
 
     /**
-     * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+     * 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 -->
      * 
-     * <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) return (PropertiesPackage)EPackage.Registry.INSTANCE.getEPackage(PropertiesPackage.eNS_URI);
+        if (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(eNS_URI) instanceof PropertiesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+                : new PropertiesPackageImpl());
 
         isInited = true;
 
@@ -189,15 +197,14 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         // Mark meta-data to indicate it can't be changed
         thePropertiesPackage.freeze();
 
-  
         // Update the registry and return the package
         EPackage.Registry.INSTANCE.put(PropertiesPackage.eNS_URI, thePropertiesPackage);
         return thePropertiesPackage;
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EClass getViewExtensionDescription() {
@@ -205,62 +212,62 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getViewExtensionDescription_Identifier() {
-        return (EAttribute)viewExtensionDescriptionEClass.getEStructuralFeatures().get(0);
+        return (EAttribute) viewExtensionDescriptionEClass.getEStructuralFeatures().get(0);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EReference getViewExtensionDescription_Metamodels() {
-        return (EReference)viewExtensionDescriptionEClass.getEStructuralFeatures().get(1);
+        return (EReference) viewExtensionDescriptionEClass.getEStructuralFeatures().get(1);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EReference getViewExtensionDescription_Pages() {
-        return (EReference)viewExtensionDescriptionEClass.getEStructuralFeatures().get(2);
+        return (EReference) viewExtensionDescriptionEClass.getEStructuralFeatures().get(2);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EReference getViewExtensionDescription_DefaultPage() {
-        return (EReference)viewExtensionDescriptionEClass.getEStructuralFeatures().get(3);
+        return (EReference) viewExtensionDescriptionEClass.getEStructuralFeatures().get(3);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getViewExtensionDescription_LabelExpression() {
-        return (EAttribute)viewExtensionDescriptionEClass.getEStructuralFeatures().get(4);
+        return (EAttribute) viewExtensionDescriptionEClass.getEStructuralFeatures().get(4);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EReference getViewExtensionDescription_Groups() {
-        return (EReference)viewExtensionDescriptionEClass.getEStructuralFeatures().get(5);
+        return (EReference) viewExtensionDescriptionEClass.getEStructuralFeatures().get(5);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EClass getPageDescription() {
@@ -268,53 +275,53 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getPageDescription_Identifier() {
-        return (EAttribute)pageDescriptionEClass.getEStructuralFeatures().get(0);
+        return (EAttribute) pageDescriptionEClass.getEStructuralFeatures().get(0);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getPageDescription_LabelExpression() {
-        return (EAttribute)pageDescriptionEClass.getEStructuralFeatures().get(1);
+        return (EAttribute) pageDescriptionEClass.getEStructuralFeatures().get(1);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getPageDescription_DomainClass() {
-        return (EAttribute)pageDescriptionEClass.getEStructuralFeatures().get(2);
+        return (EAttribute) pageDescriptionEClass.getEStructuralFeatures().get(2);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getPageDescription_SemanticCandidateExpression() {
-        return (EAttribute)pageDescriptionEClass.getEStructuralFeatures().get(3);
+        return (EAttribute) pageDescriptionEClass.getEStructuralFeatures().get(3);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EReference getPageDescription_Groups() {
-        return (EReference)pageDescriptionEClass.getEStructuralFeatures().get(4);
+        return (EReference) pageDescriptionEClass.getEStructuralFeatures().get(4);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EClass getGroupDescription() {
@@ -322,53 +329,53 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getGroupDescription_Identifier() {
-        return (EAttribute)groupDescriptionEClass.getEStructuralFeatures().get(0);
+        return (EAttribute) groupDescriptionEClass.getEStructuralFeatures().get(0);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getGroupDescription_LabelExpression() {
-        return (EAttribute)groupDescriptionEClass.getEStructuralFeatures().get(1);
+        return (EAttribute) groupDescriptionEClass.getEStructuralFeatures().get(1);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getGroupDescription_DomainClass() {
-        return (EAttribute)groupDescriptionEClass.getEStructuralFeatures().get(2);
+        return (EAttribute) groupDescriptionEClass.getEStructuralFeatures().get(2);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getGroupDescription_SemanticCandidateExpression() {
-        return (EAttribute)groupDescriptionEClass.getEStructuralFeatures().get(3);
+        return (EAttribute) groupDescriptionEClass.getEStructuralFeatures().get(3);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EReference getGroupDescription_Container() {
-        return (EReference)groupDescriptionEClass.getEStructuralFeatures().get(4);
+        return (EReference) groupDescriptionEClass.getEStructuralFeatures().get(4);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EClass getContainerDescription() {
@@ -376,35 +383,35 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getContainerDescription_Identifier() {
-        return (EAttribute)containerDescriptionEClass.getEStructuralFeatures().get(0);
+        return (EAttribute) containerDescriptionEClass.getEStructuralFeatures().get(0);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EReference getContainerDescription_Widgets() {
-        return (EReference)containerDescriptionEClass.getEStructuralFeatures().get(1);
+        return (EReference) containerDescriptionEClass.getEStructuralFeatures().get(1);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EReference getContainerDescription_DynamicMappings() {
-        return (EReference)containerDescriptionEClass.getEStructuralFeatures().get(2);
+        return (EReference) containerDescriptionEClass.getEStructuralFeatures().get(2);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EClass getWidgetDescription() {
@@ -412,26 +419,26 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getWidgetDescription_Identifier() {
-        return (EAttribute)widgetDescriptionEClass.getEStructuralFeatures().get(0);
+        return (EAttribute) widgetDescriptionEClass.getEStructuralFeatures().get(0);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getWidgetDescription_LabelExpression() {
-        return (EAttribute)widgetDescriptionEClass.getEStructuralFeatures().get(1);
+        return (EAttribute) widgetDescriptionEClass.getEStructuralFeatures().get(1);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EClass getTextDescription() {
@@ -439,26 +446,53 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getTextDescription_ValueExpression() {
-        return (EAttribute)textDescriptionEClass.getEStructuralFeatures().get(0);
+        return (EAttribute) textDescriptionEClass.getEStructuralFeatures().get(0);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EReference getTextDescription_InitialOperation() {
-        return (EReference)textDescriptionEClass.getEStructuralFeatures().get(1);
+        return (EReference) textDescriptionEClass.getEStructuralFeatures().get(1);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public EClass getButtonDescription() {
+        return buttonDescriptionEClass;
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public EAttribute getButtonDescription_ButtonLabelExpression() {
+        return (EAttribute) buttonDescriptionEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    public EReference getButtonDescription_InitialOperation() {
+        return (EReference) buttonDescriptionEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EClass getLabelDescription() {
@@ -466,8 +500,8 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EClass getCheckboxDescription() {
@@ -475,26 +509,26 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getCheckboxDescription_ValueExpression() {
-        return (EAttribute)checkboxDescriptionEClass.getEStructuralFeatures().get(0);
+        return (EAttribute) checkboxDescriptionEClass.getEStructuralFeatures().get(0);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EReference getCheckboxDescription_InitialOperation() {
-        return (EReference)checkboxDescriptionEClass.getEStructuralFeatures().get(1);
+        return (EReference) checkboxDescriptionEClass.getEStructuralFeatures().get(1);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EClass getSelectDescription() {
@@ -502,44 +536,44 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getSelectDescription_ValueExpression() {
-        return (EAttribute)selectDescriptionEClass.getEStructuralFeatures().get(0);
+        return (EAttribute) selectDescriptionEClass.getEStructuralFeatures().get(0);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EReference getSelectDescription_InitialOperation() {
-        return (EReference)selectDescriptionEClass.getEStructuralFeatures().get(1);
+        return (EReference) selectDescriptionEClass.getEStructuralFeatures().get(1);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getSelectDescription_CandidatesExpression() {
-        return (EAttribute)selectDescriptionEClass.getEStructuralFeatures().get(2);
+        return (EAttribute) selectDescriptionEClass.getEStructuralFeatures().get(2);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getSelectDescription_CandidateDisplayExpression() {
-        return (EAttribute)selectDescriptionEClass.getEStructuralFeatures().get(3);
+        return (EAttribute) selectDescriptionEClass.getEStructuralFeatures().get(3);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EClass getDynamicMappingFor() {
@@ -547,35 +581,35 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getDynamicMappingFor_Iterator() {
-        return (EAttribute)dynamicMappingForEClass.getEStructuralFeatures().get(0);
+        return (EAttribute) dynamicMappingForEClass.getEStructuralFeatures().get(0);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getDynamicMappingFor_DomainClassExpression() {
-        return (EAttribute)dynamicMappingForEClass.getEStructuralFeatures().get(1);
+        return (EAttribute) dynamicMappingForEClass.getEStructuralFeatures().get(1);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EReference getDynamicMappingFor_Switch() {
-        return (EReference)dynamicMappingForEClass.getEStructuralFeatures().get(2);
+        return (EReference) dynamicMappingForEClass.getEStructuralFeatures().get(2);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EClass getDynamicMappingSwitch() {
@@ -583,26 +617,26 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getDynamicMappingSwitch_SwitchExpression() {
-        return (EAttribute)dynamicMappingSwitchEClass.getEStructuralFeatures().get(0);
+        return (EAttribute) dynamicMappingSwitchEClass.getEStructuralFeatures().get(0);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EReference getDynamicMappingSwitch_Cases() {
-        return (EReference)dynamicMappingSwitchEClass.getEStructuralFeatures().get(1);
+        return (EReference) dynamicMappingSwitchEClass.getEStructuralFeatures().get(1);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EClass getDynamicMappingCase() {
@@ -610,48 +644,49 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EAttribute getDynamicMappingCase_CaseExpression() {
-        return (EAttribute)dynamicMappingCaseEClass.getEStructuralFeatures().get(0);
+        return (EAttribute) dynamicMappingCaseEClass.getEStructuralFeatures().get(0);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EReference getDynamicMappingCase_Widget() {
-        return (EReference)dynamicMappingCaseEClass.getEStructuralFeatures().get(1);
+        return (EReference) dynamicMappingCaseEClass.getEStructuralFeatures().get(1);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public PropertiesFactory getPropertiesFactory() {
-        return (PropertiesFactory)getEFactoryInstance();
+        return (PropertiesFactory) getEFactoryInstance();
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private boolean isCreated = false;
 
     /**
-     * Creates the meta-model objects for the package.  This method is
-     * guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
+     * Creates the meta-model objects for the package. This method is guarded to
+     * have no affect on any invocation but its first. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void createPackageContents() {
-        if (isCreated) return;
+        if (isCreated)
+            return;
         isCreated = true;
 
         // Create classes and their features
@@ -690,6 +725,10 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         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);
@@ -717,21 +756,22 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     private boolean isInitialized = false;
 
     /**
-     * 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 -->
+     * 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) return;
+        if (isInitialized)
+            return;
         isInitialized = true;
 
         // Initialize package
@@ -740,9 +780,9 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         setNsURI(eNS_URI);
 
         // Obtain other dependent packages
-        DescriptionPackage theDescriptionPackage = (DescriptionPackage)EPackage.Registry.INSTANCE.getEPackage(DescriptionPackage.eNS_URI);
-        EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-        ToolPackage theToolPackage = (ToolPackage)EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI);
+        DescriptionPackage theDescriptionPackage = (DescriptionPackage) EPackage.Registry.INSTANCE.getEPackage(DescriptionPackage.eNS_URI);
+        EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+        ToolPackage theToolPackage = (ToolPackage) EPackage.Registry.INSTANCE.getEPackage(ToolPackage.eNS_URI);
 
         // Create type parameters
 
@@ -751,73 +791,116 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         // Add supertypes to classes
         viewExtensionDescriptionEClass.getESuperTypes().add(theDescriptionPackage.getExtension());
         textDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
+        buttonDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
         labelDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
         checkboxDescriptionEClass.getESuperTypes().add(this.getWidgetDescription());
         selectDescriptionEClass.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);
+        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);
-        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);
+        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);
+        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);
-        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);
+        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);
+        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);
+        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);
+        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);
+        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);
+        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);
-        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);
+        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);
+        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);
+        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);
+        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);
+        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);
 
         // Create resource
         createResource(eNS_URI);
     }
 
-} //PropertiesPackageImpl
+} // PropertiesPackageImpl
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 122c5a42a2..f44ea9646c 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
@@ -13,28 +13,31 @@ 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.SelectDescription;
-
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Select Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Select Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getValueExpression <em>Value Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getInitialOperation <em>Initial Operation</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getCandidatesExpression <em>Candidates Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getCandidateDisplayExpression <em>Candidate Display Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getValueExpression
+ * <em>Value Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getInitialOperation
+ * <em>Initial Operation</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getCandidatesExpression
+ * <em>Candidates Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.SelectDescriptionImpl#getCandidateDisplayExpression
+ * <em>Candidate Display Expression</em>}</li>
  * </ul>
  * </p>
  *
@@ -42,9 +45,10 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  */
 public class SelectDescriptionImpl extends WidgetDescriptionImpl implements SelectDescription {
     /**
-     * The default value of the '{@link #getValueExpression() <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getValueExpression()
+     * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -52,9 +56,10 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     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 -->
+     * The cached value of the '{@link #getValueExpression()
+     * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -62,9 +67,10 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     protected String valueExpression = VALUE_EXPRESSION_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getInitialOperation() <em>Initial Operation</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getInitialOperation()
+     * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @see #getInitialOperation()
      * @generated
      * @ordered
@@ -72,9 +78,10 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     protected InitialOperation initialOperation;
 
     /**
-     * The default value of the '{@link #getCandidatesExpression() <em>Candidates Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getCandidatesExpression()
+     * <em>Candidates Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getCandidatesExpression()
      * @generated
      * @ordered
@@ -82,9 +89,10 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     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 -->
+     * The cached value of the '{@link #getCandidatesExpression()
+     * <em>Candidates Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getCandidatesExpression()
      * @generated
      * @ordered
@@ -92,9 +100,10 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     protected String candidatesExpression = CANDIDATES_EXPRESSION_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getCandidateDisplayExpression() <em>Candidate Display Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getCandidateDisplayExpression()
+     * <em>Candidate Display Expression</em>}' attribute. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @see #getCandidateDisplayExpression()
      * @generated
      * @ordered
@@ -102,9 +111,10 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     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 -->
+     * The cached value of the '{@link #getCandidateDisplayExpression()
+     * <em>Candidate Display Expression</em>}' attribute. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @see #getCandidateDisplayExpression()
      * @generated
      * @ordered
@@ -112,8 +122,8 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     protected String candidateDisplayExpression = CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected SelectDescriptionImpl() {
@@ -121,8 +131,8 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -131,8 +141,8 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getValueExpression() {
@@ -140,8 +150,8 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setValueExpression(String newValueExpression) {
@@ -152,8 +162,8 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public InitialOperation getInitialOperation() {
@@ -161,8 +171,8 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public NotificationChain basicSetInitialOperation(InitialOperation newInitialOperation, NotificationChain msgs) {
@@ -170,33 +180,36 @@ 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) msgs = notification; else msgs.add(notification);
+            if (msgs == null)
+                msgs = notification;
+            else
+                msgs.add(notification);
         }
         return msgs;
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     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);
+                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);
+                msgs = ((InternalEObject) newInitialOperation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION, null, msgs);
             msgs = basicSetInitialOperation(newInitialOperation, msgs);
-            if (msgs != null) msgs.dispatch();
-        }
-        else if (eNotificationRequired())
+            if (msgs != null)
+                msgs.dispatch();
+        } else if (eNotificationRequired())
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION, newInitialOperation, newInitialOperation));
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getCandidatesExpression() {
@@ -204,8 +217,8 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setCandidatesExpression(String newCandidatesExpression) {
@@ -216,8 +229,8 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getCandidateDisplayExpression() {
@@ -225,8 +238,8 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setCandidateDisplayExpression(String newCandidateDisplayExpression) {
@@ -237,115 +250,116 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
-            case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
-                return basicSetInitialOperation(null, msgs);
+        case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
+            return basicSetInitialOperation(null, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
-                return getValueExpression();
-            case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
-                return getInitialOperation();
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
-                return getCandidatesExpression();
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
-                return getCandidateDisplayExpression();
+        case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
+            return getValueExpression();
+        case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
+            return getInitialOperation();
+        case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
+            return getCandidatesExpression();
+        case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
+            return getCandidateDisplayExpression();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
-                setValueExpression((String)newValue);
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
-                setInitialOperation((InitialOperation)newValue);
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
-                setCandidatesExpression((String)newValue);
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
-                setCandidateDisplayExpression((String)newValue);
-                return;
+        case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
+            setValueExpression((String) newValue);
+            return;
+        case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
+            setInitialOperation((InitialOperation) newValue);
+            return;
+        case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
+            setCandidatesExpression((String) newValue);
+            return;
+        case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
+            setCandidateDisplayExpression((String) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
-                setValueExpression(VALUE_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
-                setInitialOperation((InitialOperation)null);
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
-                setCandidatesExpression(CANDIDATES_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
-                setCandidateDisplayExpression(CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT);
-                return;
+        case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
+            setValueExpression(VALUE_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.SELECT_DESCRIPTION__INITIAL_OPERATION:
+            setInitialOperation((InitialOperation) null);
+            return;
+        case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION:
+            setCandidatesExpression(CANDIDATES_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
+            setCandidateDisplayExpression(CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT);
+            return;
         }
         super.eUnset(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     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);
-            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);
-            case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
-                return CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT == null ? candidateDisplayExpression != null : !CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT.equals(candidateDisplayExpression);
+        case PropertiesPackage.SELECT_DESCRIPTION__VALUE_EXPRESSION:
+            return VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !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);
+        case PropertiesPackage.SELECT_DESCRIPTION__CANDIDATE_DISPLAY_EXPRESSION:
+            return CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT == null ? candidateDisplayExpression != null : !CANDIDATE_DISPLAY_EXPRESSION_EDEFAULT.equals(candidateDisplayExpression);
         }
         return super.eIsSet(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if (eIsProxy())
+            return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (valueExpression: ");
@@ -358,4 +372,4 @@ public class SelectDescriptionImpl extends WidgetDescriptionImpl implements Sele
         return result.toString();
     }
 
-} //SelectDescriptionImpl
+} // SelectDescriptionImpl
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 28e84241b8..5c623f1ba7 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
@@ -13,26 +13,25 @@ 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.TextDescription;
-
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Text Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Text Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.impl.TextDescriptionImpl#getValueExpression <em>Value Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.TextDescriptionImpl#getInitialOperation <em>Initial Operation</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.TextDescriptionImpl#getValueExpression
+ * <em>Value Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.TextDescriptionImpl#getInitialOperation
+ * <em>Initial Operation</em>}</li>
  * </ul>
  * </p>
  *
@@ -40,9 +39,10 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
  */
 public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDescription {
     /**
-     * The default value of the '{@link #getValueExpression() <em>Value Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getValueExpression()
+     * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -50,9 +50,10 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     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 -->
+     * The cached value of the '{@link #getValueExpression()
+     * <em>Value Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getValueExpression()
      * @generated
      * @ordered
@@ -60,9 +61,10 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     protected String valueExpression = VALUE_EXPRESSION_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getInitialOperation() <em>Initial Operation</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getInitialOperation()
+     * <em>Initial Operation</em>}' containment reference. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
      * @see #getInitialOperation()
      * @generated
      * @ordered
@@ -70,8 +72,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     protected InitialOperation initialOperation;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected TextDescriptionImpl() {
@@ -79,8 +81,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -89,8 +91,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getValueExpression() {
@@ -98,8 +100,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setValueExpression(String newValueExpression) {
@@ -110,8 +112,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public InitialOperation getInitialOperation() {
@@ -119,8 +121,8 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public NotificationChain basicSetInitialOperation(InitialOperation newInitialOperation, NotificationChain msgs) {
@@ -128,120 +130,124 @@ 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) msgs = notification; else msgs.add(notification);
+            if (msgs == null)
+                msgs = notification;
+            else
+                msgs.add(notification);
         }
         return msgs;
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     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);
+                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);
+                msgs = ((InternalEObject) newInitialOperation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION, null, msgs);
             msgs = basicSetInitialOperation(newInitialOperation, msgs);
-            if (msgs != null) msgs.dispatch();
-        }
-        else if (eNotificationRequired())
+            if (msgs != null)
+                msgs.dispatch();
+        } else if (eNotificationRequired())
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION, newInitialOperation, newInitialOperation));
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
-            case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
-                return basicSetInitialOperation(null, msgs);
+        case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
+            return basicSetInitialOperation(null, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION:
-                return getValueExpression();
-            case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
-                return getInitialOperation();
+        case PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION:
+            return getValueExpression();
+        case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
+            return getInitialOperation();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION:
-                setValueExpression((String)newValue);
-                return;
-            case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
-                setInitialOperation((InitialOperation)newValue);
-                return;
+        case PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION:
+            setValueExpression((String) newValue);
+            return;
+        case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
+            setInitialOperation((InitialOperation) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION:
-                setValueExpression(VALUE_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
-                setInitialOperation((InitialOperation)null);
-                return;
+        case PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION:
+            setValueExpression(VALUE_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
+            setInitialOperation((InitialOperation) null);
+            return;
         }
         super.eUnset(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     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);
-            case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
-                return initialOperation != null;
+        case PropertiesPackage.TEXT_DESCRIPTION__VALUE_EXPRESSION:
+            return VALUE_EXPRESSION_EDEFAULT == null ? valueExpression != null : !VALUE_EXPRESSION_EDEFAULT.equals(valueExpression);
+        case PropertiesPackage.TEXT_DESCRIPTION__INITIAL_OPERATION:
+            return initialOperation != null;
         }
         return super.eIsSet(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if (eIsProxy())
+            return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (valueExpression: ");
@@ -250,4 +256,4 @@ public class TextDescriptionImpl extends WidgetDescriptionImpl implements TextDe
         return result.toString();
     }
 
-} //TextDescriptionImpl
+} // TextDescriptionImpl
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 d9d6a38f08..1cda0b83eb 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
@@ -15,38 +15,44 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.sirius.properties.GroupDescription;
 import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>View Extension Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>View Extension Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getMetamodels <em>Metamodels</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getPages <em>Pages</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getDefaultPage <em>Default Page</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getLabelExpression <em>Label Expression</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getGroups <em>Groups</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getIdentifier
+ * <em>Identifier</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getMetamodels
+ * <em>Metamodels</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getPages
+ * <em>Pages</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getDefaultPage
+ * <em>Default Page</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getLabelExpression
+ * <em>Label Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.ViewExtensionDescriptionImpl#getGroups
+ * <em>Groups</em>}</li>
  * </ul>
  * </p>
  *
@@ -54,9 +60,9 @@ import org.eclipse.sirius.properties.ViewExtensionDescription;
  */
 public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container implements ViewExtensionDescription {
     /**
-     * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getIdentifier() <em>Identifier</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -64,9 +70,9 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     protected static final String IDENTIFIER_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -74,9 +80,9 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     protected String identifier = IDENTIFIER_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getMetamodels() <em>Metamodels</em>}' reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getMetamodels() <em>Metamodels</em>}'
+     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getMetamodels()
      * @generated
      * @ordered
@@ -84,9 +90,9 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     protected EList<EPackage> metamodels;
 
     /**
-     * The cached value of the '{@link #getPages() <em>Pages</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getPages() <em>Pages</em>}' containment
+     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getPages()
      * @generated
      * @ordered
@@ -94,9 +100,9 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     protected EList<PageDescription> pages;
 
     /**
-     * The cached value of the '{@link #getDefaultPage() <em>Default Page</em>}' reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getDefaultPage() <em>Default Page</em>}'
+     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getDefaultPage()
      * @generated
      * @ordered
@@ -104,9 +110,10 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     protected PageDescription defaultPage;
 
     /**
-     * The default value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getLabelExpression()
+     * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -114,9 +121,10 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     protected static final String LABEL_EXPRESSION_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getLabelExpression()
+     * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -124,9 +132,9 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     protected String labelExpression = LABEL_EXPRESSION_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getGroups() <em>Groups</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getGroups() <em>Groups</em>}'
+     * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getGroups()
      * @generated
      * @ordered
@@ -134,8 +142,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     protected EList<GroupDescription> groups;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected ViewExtensionDescriptionImpl() {
@@ -143,8 +151,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -153,8 +161,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getIdentifier() {
@@ -162,8 +170,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setIdentifier(String newIdentifier) {
@@ -174,8 +182,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EList<EPackage> getMetamodels() {
@@ -186,8 +194,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EList<PageDescription> getPages() {
@@ -198,14 +206,14 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public PageDescription getDefaultPage() {
         if (defaultPage != null && defaultPage.eIsProxy()) {
-            InternalEObject oldDefaultPage = (InternalEObject)defaultPage;
-            defaultPage = (PageDescription)eResolveProxy(oldDefaultPage);
+            InternalEObject oldDefaultPage = (InternalEObject) defaultPage;
+            defaultPage = (PageDescription) eResolveProxy(oldDefaultPage);
             if (defaultPage != oldDefaultPage) {
                 if (eNotificationRequired())
                     eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE, oldDefaultPage, defaultPage));
@@ -215,8 +223,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public PageDescription basicGetDefaultPage() {
@@ -224,8 +232,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setDefaultPage(PageDescription newDefaultPage) {
@@ -236,8 +244,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getLabelExpression() {
@@ -245,8 +253,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setLabelExpression(String newLabelExpression) {
@@ -257,8 +265,8 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public EList<GroupDescription> getGroups() {
@@ -269,142 +277,144 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
-                return ((InternalEList<?>)getPages()).basicRemove(otherEnd, msgs);
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
-                return ((InternalEList<?>)getGroups()).basicRemove(otherEnd, msgs);
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
+            return ((InternalEList<?>) getPages()).basicRemove(otherEnd, msgs);
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
+            return ((InternalEList<?>) getGroups()).basicRemove(otherEnd, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER:
-                return getIdentifier();
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__METAMODELS:
-                return getMetamodels();
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
-                return getPages();
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE:
-                if (resolve) return getDefaultPage();
-                return basicGetDefaultPage();
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
-                return getLabelExpression();
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
-                return getGroups();
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER:
+            return getIdentifier();
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__METAMODELS:
+            return getMetamodels();
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
+            return getPages();
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE:
+            if (resolve)
+                return getDefaultPage();
+            return basicGetDefaultPage();
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
+            return getLabelExpression();
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
+            return getGroups();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @SuppressWarnings("unchecked")
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER:
-                setIdentifier((String)newValue);
-                return;
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__METAMODELS:
-                getMetamodels().clear();
-                getMetamodels().addAll((Collection<? extends EPackage>)newValue);
-                return;
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
-                getPages().clear();
-                getPages().addAll((Collection<? extends PageDescription>)newValue);
-                return;
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE:
-                setDefaultPage((PageDescription)newValue);
-                return;
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
-                setLabelExpression((String)newValue);
-                return;
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
-                getGroups().clear();
-                getGroups().addAll((Collection<? extends GroupDescription>)newValue);
-                return;
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER:
+            setIdentifier((String) newValue);
+            return;
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__METAMODELS:
+            getMetamodels().clear();
+            getMetamodels().addAll((Collection<? extends EPackage>) newValue);
+            return;
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
+            getPages().clear();
+            getPages().addAll((Collection<? extends PageDescription>) newValue);
+            return;
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE:
+            setDefaultPage((PageDescription) newValue);
+            return;
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
+            setLabelExpression((String) newValue);
+            return;
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
+            getGroups().clear();
+            getGroups().addAll((Collection<? extends GroupDescription>) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER:
-                setIdentifier(IDENTIFIER_EDEFAULT);
-                return;
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__METAMODELS:
-                getMetamodels().clear();
-                return;
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
-                getPages().clear();
-                return;
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE:
-                setDefaultPage((PageDescription)null);
-                return;
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
-                setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
-                return;
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
-                getGroups().clear();
-                return;
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER:
+            setIdentifier(IDENTIFIER_EDEFAULT);
+            return;
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__METAMODELS:
+            getMetamodels().clear();
+            return;
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
+            getPages().clear();
+            return;
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__DEFAULT_PAGE:
+            setDefaultPage((PageDescription) null);
+            return;
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__LABEL_EXPRESSION:
+            setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
+            return;
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
+            getGroups().clear();
+            return;
         }
         super.eUnset(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER:
-                return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__METAMODELS:
-                return metamodels != null && !metamodels.isEmpty();
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
-                return pages != null && !pages.isEmpty();
-            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);
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
-                return groups != null && !groups.isEmpty();
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__IDENTIFIER:
+            return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__METAMODELS:
+            return metamodels != null && !metamodels.isEmpty();
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__PAGES:
+            return pages != null && !pages.isEmpty();
+        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);
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION__GROUPS:
+            return groups != null && !groups.isEmpty();
         }
         return super.eIsSet(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if (eIsProxy())
+            return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (identifier: ");
@@ -415,4 +425,4 @@ public class ViewExtensionDescriptionImpl extends MinimalEObjectImpl.Container i
         return result.toString();
     }
 
-} //ViewExtensionDescriptionImpl
+} // ViewExtensionDescriptionImpl
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 b1adba2abe..7bbf82a8cb 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
@@ -12,24 +12,24 @@
 package org.eclipse.sirius.properties.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.sirius.properties.PropertiesPackage;
 import org.eclipse.sirius.properties.WidgetDescription;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Widget Description</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Widget Description</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl#getLabelExpression <em>Label Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl#getIdentifier
+ * <em>Identifier</em>}</li>
+ * <li>
+ * {@link org.eclipse.sirius.properties.impl.WidgetDescriptionImpl#getLabelExpression
+ * <em>Label Expression</em>}</li>
  * </ul>
  * </p>
  *
@@ -37,9 +37,9 @@ import org.eclipse.sirius.properties.WidgetDescription;
  */
 public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container implements WidgetDescription {
     /**
-     * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getIdentifier() <em>Identifier</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -47,9 +47,9 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     protected static final String IDENTIFIER_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}'
+     * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see #getIdentifier()
      * @generated
      * @ordered
@@ -57,9 +57,10 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     protected String identifier = IDENTIFIER_EDEFAULT;
 
     /**
-     * The default value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The default value of the '{@link #getLabelExpression()
+     * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -67,9 +68,10 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     protected static final String LABEL_EXPRESSION_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getLabelExpression() <em>Label Expression</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached value of the '{@link #getLabelExpression()
+     * <em>Label Expression</em>}' attribute. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @see #getLabelExpression()
      * @generated
      * @ordered
@@ -77,8 +79,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     protected String labelExpression = LABEL_EXPRESSION_EDEFAULT;
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected WidgetDescriptionImpl() {
@@ -86,8 +88,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -96,8 +98,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getIdentifier() {
@@ -105,8 +107,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setIdentifier(String newIdentifier) {
@@ -117,8 +119,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public String getLabelExpression() {
@@ -126,8 +128,8 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setLabelExpression(String newLabelExpression) {
@@ -138,81 +140,82 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER:
-                return getIdentifier();
-            case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
-                return getLabelExpression();
+        case PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER:
+            return getIdentifier();
+        case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
+            return getLabelExpression();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER:
-                setIdentifier((String)newValue);
-                return;
-            case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
-                setLabelExpression((String)newValue);
-                return;
+        case PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER:
+            setIdentifier((String) newValue);
+            return;
+        case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
+            setLabelExpression((String) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER:
-                setIdentifier(IDENTIFIER_EDEFAULT);
-                return;
-            case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
-                setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
-                return;
+        case PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER:
+            setIdentifier(IDENTIFIER_EDEFAULT);
+            return;
+        case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
+            setLabelExpression(LABEL_EXPRESSION_EDEFAULT);
+            return;
         }
         super.eUnset(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER:
-                return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
-            case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
-                return LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
+        case PropertiesPackage.WIDGET_DESCRIPTION__IDENTIFIER:
+            return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
+        case PropertiesPackage.WIDGET_DESCRIPTION__LABEL_EXPRESSION:
+            return LABEL_EXPRESSION_EDEFAULT == null ? labelExpression != null : !LABEL_EXPRESSION_EDEFAULT.equals(labelExpression);
         }
         return super.eIsSet(featureID);
     }
 
     /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy()) return super.toString();
+        if (eIsProxy())
+            return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (identifier: ");
@@ -223,4 +226,4 @@ public abstract class WidgetDescriptionImpl extends MinimalEObjectImpl.Container
         return result.toString();
     }
 
-} //WidgetDescriptionImpl
+} // WidgetDescriptionImpl
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 c16c4e05d2..bdae4b6717 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
@@ -13,36 +13,44 @@ package org.eclipse.sirius.properties.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
 import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.sirius.properties.*;
-
+import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.ContainerDescription;
+import org.eclipse.sirius.properties.DynamicMappingCase;
+import org.eclipse.sirius.properties.DynamicMappingFor;
+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.PropertiesPackage;
+import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.ViewExtensionDescription;
+import org.eclipse.sirius.properties.WidgetDescription;
 import org.eclipse.sirius.viewpoint.description.Extension;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
+ * an adapter <code>createXXX</code> method for each class of the model. <!--
+ * end-user-doc -->
+ * 
  * @see org.eclipse.sirius.properties.PropertiesPackage
  * @generated
  */
 public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     /**
-     * The cached model package.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected static PropertiesPackage modelPackage;
 
     /**
-     * Creates an instance of the adapter factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     public PropertiesAdapterFactory() {
@@ -53,9 +61,10 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Returns whether this factory is applicable for the type of the object.
-     * <!-- begin-user-doc -->
-     * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-     * <!-- end-user-doc -->
+     * <!-- begin-user-doc --> This implementation returns <code>true</code> if
+     * the object is either the model's package or is an instance object of the
+     * model. <!-- end-user-doc -->
+     * 
      * @return whether this factory is applicable for the type of the object.
      * @generated
      */
@@ -65,97 +74,116 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
             return true;
         }
         if (object instanceof EObject) {
-            return ((EObject)object).eClass().getEPackage() == modelPackage;
+            return ((EObject) object).eClass().getEPackage() == modelPackage;
         }
         return false;
     }
 
     /**
-     * The switch that delegates to the <code>createXXX</code> methods.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The switch that delegates to the <code>createXXX</code> methods. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
-    protected PropertiesSwitch<Adapter> modelSwitch =
-        new PropertiesSwitch<Adapter>() {
-            @Override
-            public Adapter caseViewExtensionDescription(ViewExtensionDescription object) {
-                return createViewExtensionDescriptionAdapter();
-            }
-            @Override
-            public Adapter casePageDescription(PageDescription object) {
-                return createPageDescriptionAdapter();
-            }
-            @Override
-            public Adapter caseGroupDescription(GroupDescription object) {
-                return createGroupDescriptionAdapter();
-            }
-            @Override
-            public Adapter caseContainerDescription(ContainerDescription object) {
-                return createContainerDescriptionAdapter();
-            }
-            @Override
-            public Adapter caseWidgetDescription(WidgetDescription object) {
-                return createWidgetDescriptionAdapter();
-            }
-            @Override
-            public Adapter caseTextDescription(TextDescription object) {
-                return createTextDescriptionAdapter();
-            }
-            @Override
-            public Adapter caseLabelDescription(LabelDescription object) {
-                return createLabelDescriptionAdapter();
-            }
-            @Override
-            public Adapter caseCheckboxDescription(CheckboxDescription object) {
-                return createCheckboxDescriptionAdapter();
-            }
-            @Override
-            public Adapter caseSelectDescription(SelectDescription object) {
-                return createSelectDescriptionAdapter();
-            }
-            @Override
-            public Adapter caseDynamicMappingFor(DynamicMappingFor object) {
-                return createDynamicMappingForAdapter();
-            }
-            @Override
-            public Adapter caseDynamicMappingSwitch(DynamicMappingSwitch object) {
-                return createDynamicMappingSwitchAdapter();
-            }
-            @Override
-            public Adapter caseDynamicMappingCase(DynamicMappingCase object) {
-                return createDynamicMappingCaseAdapter();
-            }
-            @Override
-            public Adapter caseExtension(Extension object) {
-                return createExtensionAdapter();
-            }
-            @Override
-            public Adapter defaultCase(EObject object) {
-                return createEObjectAdapter();
-            }
-        };
+    protected PropertiesSwitch<Adapter> modelSwitch = new PropertiesSwitch<Adapter>() {
+        @Override
+        public Adapter caseViewExtensionDescription(ViewExtensionDescription object) {
+            return createViewExtensionDescriptionAdapter();
+        }
+
+        @Override
+        public Adapter casePageDescription(PageDescription object) {
+            return createPageDescriptionAdapter();
+        }
+
+        @Override
+        public Adapter caseGroupDescription(GroupDescription object) {
+            return createGroupDescriptionAdapter();
+        }
+
+        @Override
+        public Adapter caseContainerDescription(ContainerDescription object) {
+            return createContainerDescriptionAdapter();
+        }
+
+        @Override
+        public Adapter caseWidgetDescription(WidgetDescription object) {
+            return createWidgetDescriptionAdapter();
+        }
+
+        @Override
+        public Adapter caseTextDescription(TextDescription object) {
+            return createTextDescriptionAdapter();
+        }
+
+        @Override
+        public Adapter caseButtonDescription(ButtonDescription object) {
+            return createButtonDescriptionAdapter();
+        }
+
+        @Override
+        public Adapter caseLabelDescription(LabelDescription object) {
+            return createLabelDescriptionAdapter();
+        }
+
+        @Override
+        public Adapter caseCheckboxDescription(CheckboxDescription object) {
+            return createCheckboxDescriptionAdapter();
+        }
+
+        @Override
+        public Adapter caseSelectDescription(SelectDescription object) {
+            return createSelectDescriptionAdapter();
+        }
+
+        @Override
+        public Adapter caseDynamicMappingFor(DynamicMappingFor object) {
+            return createDynamicMappingForAdapter();
+        }
+
+        @Override
+        public Adapter caseDynamicMappingSwitch(DynamicMappingSwitch object) {
+            return createDynamicMappingSwitchAdapter();
+        }
+
+        @Override
+        public Adapter caseDynamicMappingCase(DynamicMappingCase object) {
+            return createDynamicMappingCaseAdapter();
+        }
+
+        @Override
+        public Adapter caseExtension(Extension object) {
+            return createExtensionAdapter();
+        }
+
+        @Override
+        public Adapter defaultCase(EObject object) {
+            return createEObjectAdapter();
+        }
+    };
 
     /**
-     * Creates an adapter for the <code>target</code>.
-     * <!-- begin-user-doc -->
+     * Creates an adapter for the <code>target</code>. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @param target the object to adapt.
+     * 
+     * @param target
+     *            the object to adapt.
      * @return the adapter for the <code>target</code>.
      * @generated
      */
     @Override
     public Adapter createAdapter(Notifier target) {
-        return modelSwitch.doSwitch((EObject)target);
+        return modelSwitch.doSwitch((EObject) target);
     }
 
-
     /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.ViewExtensionDescription <em>View Extension 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 -->
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.ViewExtensionDescription
+     * <em>View Extension 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.ViewExtensionDescription
      * @generated
@@ -165,11 +193,13 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.PageDescription <em>Page 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.
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.PageDescription
+     * <em>Page 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.PageDescription
      * @generated
@@ -179,11 +209,13 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.GroupDescription <em>Group 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.
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.GroupDescription
+     * <em>Group 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.GroupDescription
      * @generated
@@ -193,11 +225,13 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.ContainerDescription <em>Container 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.
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.ContainerDescription
+     * <em>Container 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.ContainerDescription
      * @generated
@@ -207,11 +241,13 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.WidgetDescription <em>Widget 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.
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.WidgetDescription
+     * <em>Widget 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.WidgetDescription
      * @generated
@@ -221,11 +257,13 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.TextDescription <em>Text 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.
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.TextDescription
+     * <em>Text 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.TextDescription
      * @generated
@@ -235,11 +273,29 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.LabelDescription <em>Label 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.
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.ButtonDescription
+     * <em>Button 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.ButtonDescription
+     * @generated
+     */
+    public Adapter createButtonDescriptionAdapter() {
+        return null;
+    }
+
+    /**
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.LabelDescription
+     * <em>Label 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.LabelDescription
      * @generated
@@ -249,11 +305,13 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.CheckboxDescription <em>Checkbox 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.
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.CheckboxDescription
+     * <em>Checkbox 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.CheckboxDescription
      * @generated
@@ -263,11 +321,13 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.SelectDescription <em>Select 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.
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.SelectDescription
+     * <em>Select 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.SelectDescription
      * @generated
@@ -277,11 +337,13 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.DynamicMappingFor <em>Dynamic Mapping For</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.
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.DynamicMappingFor
+     * <em>Dynamic Mapping For</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.DynamicMappingFor
      * @generated
@@ -291,11 +353,13 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.DynamicMappingSwitch <em>Dynamic Mapping Switch</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.
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.DynamicMappingSwitch
+     * <em>Dynamic Mapping Switch</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.DynamicMappingSwitch
      * @generated
@@ -305,11 +369,13 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.properties.DynamicMappingCase <em>Dynamic Mapping Case</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.
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.properties.DynamicMappingCase
+     * <em>Dynamic Mapping Case</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.DynamicMappingCase
      * @generated
@@ -319,11 +385,13 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.viewpoint.description.Extension <em>Extension</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 -->
+     * Creates a new adapter for an object of class '
+     * {@link org.eclipse.sirius.viewpoint.description.Extension
+     * <em>Extension</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.viewpoint.description.Extension
      * @generated
@@ -333,10 +401,9 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for the default case.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null.
-     * <!-- end-user-doc -->
+     * Creates a new adapter for the default case. <!-- begin-user-doc --> This
+     * default implementation returns null. <!-- end-user-doc -->
+     * 
      * @return the new adapter.
      * @generated
      */
@@ -344,4 +411,4 @@ public class PropertiesAdapterFactory extends AdapterFactoryImpl {
         return null;
     }
 
-} //PropertiesAdapterFactory
+} // PropertiesAdapterFactory
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 af75db54d6..5ed791c1c2 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
@@ -15,37 +15,45 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.sirius.properties.*;
-
+import org.eclipse.sirius.properties.ButtonDescription;
+import org.eclipse.sirius.properties.CheckboxDescription;
+import org.eclipse.sirius.properties.ContainerDescription;
+import org.eclipse.sirius.properties.DynamicMappingCase;
+import org.eclipse.sirius.properties.DynamicMappingFor;
+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.PropertiesPackage;
+import org.eclipse.sirius.properties.SelectDescription;
+import org.eclipse.sirius.properties.TextDescription;
+import org.eclipse.sirius.properties.ViewExtensionDescription;
+import org.eclipse.sirius.properties.WidgetDescription;
 import org.eclipse.sirius.viewpoint.description.Extension;
 
 /**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
+ * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)}
  * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
+ * starting with the actual class of the object and proceeding up the
+ * inheritance hierarchy until a non-null result is returned, which is the
+ * result of the switch. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.sirius.properties.PropertiesPackage
  * @generated
  */
 public class PropertiesSwitch<T> {
     /**
-     * The cached model package
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected static PropertiesPackage modelPackage;
 
     /**
-     * Creates an instance of the switch.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
+     * Creates an instance of the switch. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
      * @generated
      */
     public PropertiesSwitch() {
@@ -55,10 +63,12 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the first non-null result returned by a <code>caseXXX</code> call.
+     * Calls <code>caseXXX</code> for each class of the model until one returns
+     * a non null result; it yields that result. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the first non-null result returned by a <code>caseXXX</code>
+     *         call.
      * @generated
      */
     public T doSwitch(EObject theEObject) {
@@ -66,123 +76,152 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the first non-null result returned by a <code>caseXXX</code> call.
+     * Calls <code>caseXXX</code> for each class of the model until one returns
+     * a non null result; it yields that result. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the first non-null result returned by a <code>caseXXX</code>
+     *         call.
      * @generated
      */
     protected T doSwitch(EClass theEClass, EObject theEObject) {
         if (theEClass.eContainer() == modelPackage) {
             return doSwitch(theEClass.getClassifierID(), theEObject);
-        }
-        else {
+        } else {
             List<EClass> eSuperTypes = theEClass.getESuperTypes();
-            return
-                eSuperTypes.isEmpty() ?
-                    defaultCase(theEObject) :
-                    doSwitch(eSuperTypes.get(0), theEObject);
+            return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
         }
     }
 
     /**
-     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the first non-null result returned by a <code>caseXXX</code> call.
+     * Calls <code>caseXXX</code> for each class of the model until one returns
+     * a non null result; it yields that result. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @return the first non-null result returned by a <code>caseXXX</code>
+     *         call.
      * @generated
      */
     protected T doSwitch(int classifierID, EObject theEObject) {
         switch (classifierID) {
-            case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION: {
-                ViewExtensionDescription viewExtensionDescription = (ViewExtensionDescription)theEObject;
-                T result = caseViewExtensionDescription(viewExtensionDescription);
-                if (result == null) result = caseExtension(viewExtensionDescription);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case PropertiesPackage.PAGE_DESCRIPTION: {
-                PageDescription pageDescription = (PageDescription)theEObject;
-                T result = casePageDescription(pageDescription);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case PropertiesPackage.GROUP_DESCRIPTION: {
-                GroupDescription groupDescription = (GroupDescription)theEObject;
-                T result = caseGroupDescription(groupDescription);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case PropertiesPackage.CONTAINER_DESCRIPTION: {
-                ContainerDescription containerDescription = (ContainerDescription)theEObject;
-                T result = caseContainerDescription(containerDescription);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case PropertiesPackage.WIDGET_DESCRIPTION: {
-                WidgetDescription widgetDescription = (WidgetDescription)theEObject;
-                T result = caseWidgetDescription(widgetDescription);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case PropertiesPackage.TEXT_DESCRIPTION: {
-                TextDescription textDescription = (TextDescription)theEObject;
-                T result = caseTextDescription(textDescription);
-                if (result == null) result = caseWidgetDescription(textDescription);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case PropertiesPackage.LABEL_DESCRIPTION: {
-                LabelDescription labelDescription = (LabelDescription)theEObject;
-                T result = caseLabelDescription(labelDescription);
-                if (result == null) result = caseWidgetDescription(labelDescription);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case PropertiesPackage.CHECKBOX_DESCRIPTION: {
-                CheckboxDescription checkboxDescription = (CheckboxDescription)theEObject;
-                T result = caseCheckboxDescription(checkboxDescription);
-                if (result == null) result = caseWidgetDescription(checkboxDescription);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case PropertiesPackage.SELECT_DESCRIPTION: {
-                SelectDescription selectDescription = (SelectDescription)theEObject;
-                T result = caseSelectDescription(selectDescription);
-                if (result == null) result = caseWidgetDescription(selectDescription);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case PropertiesPackage.DYNAMIC_MAPPING_FOR: {
-                DynamicMappingFor dynamicMappingFor = (DynamicMappingFor)theEObject;
-                T result = caseDynamicMappingFor(dynamicMappingFor);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case PropertiesPackage.DYNAMIC_MAPPING_SWITCH: {
-                DynamicMappingSwitch dynamicMappingSwitch = (DynamicMappingSwitch)theEObject;
-                T result = caseDynamicMappingSwitch(dynamicMappingSwitch);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case PropertiesPackage.DYNAMIC_MAPPING_CASE: {
-                DynamicMappingCase dynamicMappingCase = (DynamicMappingCase)theEObject;
-                T result = caseDynamicMappingCase(dynamicMappingCase);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            default: return defaultCase(theEObject);
+        case PropertiesPackage.VIEW_EXTENSION_DESCRIPTION: {
+            ViewExtensionDescription viewExtensionDescription = (ViewExtensionDescription) theEObject;
+            T result = caseViewExtensionDescription(viewExtensionDescription);
+            if (result == null)
+                result = caseExtension(viewExtensionDescription);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
+        case PropertiesPackage.PAGE_DESCRIPTION: {
+            PageDescription pageDescription = (PageDescription) theEObject;
+            T result = casePageDescription(pageDescription);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
+        case PropertiesPackage.GROUP_DESCRIPTION: {
+            GroupDescription groupDescription = (GroupDescription) theEObject;
+            T result = caseGroupDescription(groupDescription);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
+        case PropertiesPackage.CONTAINER_DESCRIPTION: {
+            ContainerDescription containerDescription = (ContainerDescription) theEObject;
+            T result = caseContainerDescription(containerDescription);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
+        case PropertiesPackage.WIDGET_DESCRIPTION: {
+            WidgetDescription widgetDescription = (WidgetDescription) theEObject;
+            T result = caseWidgetDescription(widgetDescription);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
+        case PropertiesPackage.TEXT_DESCRIPTION: {
+            TextDescription textDescription = (TextDescription) theEObject;
+            T result = caseTextDescription(textDescription);
+            if (result == null)
+                result = caseWidgetDescription(textDescription);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
+        case PropertiesPackage.BUTTON_DESCRIPTION: {
+            ButtonDescription buttonDescription = (ButtonDescription) theEObject;
+            T result = caseButtonDescription(buttonDescription);
+            if (result == null)
+                result = caseWidgetDescription(buttonDescription);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
+        case PropertiesPackage.LABEL_DESCRIPTION: {
+            LabelDescription labelDescription = (LabelDescription) theEObject;
+            T result = caseLabelDescription(labelDescription);
+            if (result == null)
+                result = caseWidgetDescription(labelDescription);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
+        case PropertiesPackage.CHECKBOX_DESCRIPTION: {
+            CheckboxDescription checkboxDescription = (CheckboxDescription) theEObject;
+            T result = caseCheckboxDescription(checkboxDescription);
+            if (result == null)
+                result = caseWidgetDescription(checkboxDescription);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
+        case PropertiesPackage.SELECT_DESCRIPTION: {
+            SelectDescription selectDescription = (SelectDescription) theEObject;
+            T result = caseSelectDescription(selectDescription);
+            if (result == null)
+                result = caseWidgetDescription(selectDescription);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
+        case PropertiesPackage.DYNAMIC_MAPPING_FOR: {
+            DynamicMappingFor dynamicMappingFor = (DynamicMappingFor) theEObject;
+            T result = caseDynamicMappingFor(dynamicMappingFor);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
+        case PropertiesPackage.DYNAMIC_MAPPING_SWITCH: {
+            DynamicMappingSwitch dynamicMappingSwitch = (DynamicMappingSwitch) theEObject;
+            T result = caseDynamicMappingSwitch(dynamicMappingSwitch);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
+        case PropertiesPackage.DYNAMIC_MAPPING_CASE: {
+            DynamicMappingCase dynamicMappingCase = (DynamicMappingCase) theEObject;
+            T result = caseDynamicMappingCase(dynamicMappingCase);
+            if (result == null)
+                result = defaultCase(theEObject);
+            return result;
+        }
+        default:
+            return defaultCase(theEObject);
         }
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>View Extension Description</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>View Extension Description</em>'.
+     * Returns the result of interpreting the object as an instance of '
+     * <em>View Extension Description</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>View Extension Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -191,13 +230,15 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>Page Description</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Page Description</em>'.
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Page Description</em>'. <!-- begin-user-doc --> This implementation
+     * returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Page Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -206,13 +247,15 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>Group Description</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Group Description</em>'.
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Group Description</em>'. <!-- begin-user-doc --> This implementation
+     * returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Group Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -221,13 +264,15 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>Container Description</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Container Description</em>'.
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Container Description</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Container Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -236,13 +281,15 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>Widget Description</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Widget Description</em>'.
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Widget Description</em>'. <!-- begin-user-doc --> This implementation
+     * returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Widget Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -251,13 +298,15 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>Text Description</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Text Description</em>'.
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Text Description</em>'. <!-- begin-user-doc --> This implementation
+     * returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Text Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -266,13 +315,32 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>Label Description</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Label Description</em>'.
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Button Description</em>'. <!-- begin-user-doc --> This implementation
+     * returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Button Description</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseButtonDescription(ButtonDescription object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Label Description</em>'. <!-- begin-user-doc --> This implementation
+     * returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Label Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -281,13 +349,15 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>Checkbox Description</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Checkbox Description</em>'.
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Checkbox Description</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Checkbox Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -296,13 +366,15 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>Select Description</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Select Description</em>'.
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Select Description</em>'. <!-- begin-user-doc --> This implementation
+     * returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Select Description</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -311,13 +383,15 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>Dynamic Mapping For</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Dynamic Mapping For</em>'.
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Dynamic Mapping For</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Dynamic Mapping For</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -326,13 +400,15 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>Dynamic Mapping Switch</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>Dynamic Mapping Switch</em>'.
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Dynamic Mapping Switch</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>Dynamic Mapping Switch</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -341,13 +417,15 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>Dynamic Mapping Case</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>Dynamic Mapping Case</em>'.
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Dynamic Mapping Case</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>Dynamic Mapping Case</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -356,13 +434,15 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>Extension</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Extension</em>'.
+     * Returns the result of interpreting the object as an instance of '
+     * <em>Extension</em>'. <!-- begin-user-doc --> This implementation returns
+     * null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Extension</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -371,13 +451,15 @@ public class PropertiesSwitch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch, but this is the last case anyway.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+     * Returns the result of interpreting the object as an instance of '
+     * <em>EObject</em>'. <!-- begin-user-doc --> This implementation returns
+     * null; returning a non-null result will terminate the switch, but this is
+     * the last case anyway. <!-- end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>EObject</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject)
      * @generated
      */
@@ -385,4 +467,4 @@ public class PropertiesSwitch<T> {
         return null;
     }
 
-} //PropertiesSwitch
+} // PropertiesSwitch
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 bf46c1543e..84e3dd2834 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
@@ -12,6 +12,7 @@ package org.eclipse.sirius.ui.properties.internal.tabprovider;
 
 import java.util.List;
 
+import org.eclipse.eef.EEFButtonDescription;
 import org.eclipse.eef.EEFCheckboxDescription;
 import org.eclipse.eef.EEFContainerDescription;
 import org.eclipse.eef.EEFDynamicMappingCase;
@@ -26,6 +27,7 @@ import org.eclipse.eef.EEFViewDescription;
 import org.eclipse.eef.EEFWidgetDescription;
 import org.eclipse.eef.EefFactory;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.sirius.properties.ButtonDescription;
 import org.eclipse.sirius.properties.CheckboxDescription;
 import org.eclipse.sirius.properties.DynamicMappingCase;
 import org.eclipse.sirius.properties.DynamicMappingFor;
@@ -150,6 +152,8 @@ public class ViewDescriptionConverter {
             description = createEEFCheckboxDescription((CheckboxDescription) widgetDescription);
         } else if (widgetDescription instanceof SelectDescription) {
             description = createEEFSelectDescription((SelectDescription) widgetDescription);
+        } else if (widgetDescription instanceof ButtonDescription) {
+            description = createEEFButtonDescription((ButtonDescription) widgetDescription);
         }
 
         return description;
@@ -175,6 +179,17 @@ public class ViewDescriptionConverter {
         return eefLabelDescription;
     }
 
+    private EEFButtonDescription createEEFButtonDescription(ButtonDescription buttonDescription) {
+        EEFButtonDescription eefButtonDescription = EefFactory.eINSTANCE.createEEFButtonDescription();
+
+        eefButtonDescription.setIdentifier(buttonDescription.getIdentifier());
+        eefButtonDescription.setLabelExpression(buttonDescription.getLabelExpression());
+        eefButtonDescription.setButtonLabelExpression(buttonDescription.getButtonLabelExpression());
+        InitialOperation initialOperation = buttonDescription.getInitialOperation();
+        eefButtonDescription.setPushExpression("aql:self.executeOperation('" + EcoreUtil.getURI(initialOperation).toString() + "')");
+        return eefButtonDescription;
+    }
+
     private EEFCheckboxDescription createEEFCheckboxDescription(CheckboxDescription checkboxDescription) {
         EEFCheckboxDescription eefCheckboxDescription = EefFactory.eINSTANCE.createEEFCheckboxDescription();