[509070] Add properties view sections for the new VSM elements

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

25 files changed, 1576 insertions, 10 deletions

diff --git a/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel b/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel
index b5e50efb12..52d844449b 100644
--- a/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel
+++ b/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel
@@ -593,12 +593,11 @@
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//description/CompositeLayout/padding"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//description/CompositeLayout/direction"/>
       </genClasses>
-      <genClasses ecoreClass="diagram.ecore#//description/GenericLayout">
-        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//description/GenericLayout/ID"/>
-        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//description/GenericLayout/label"/>
-        <genFeatures property="Readonly" createChild="false" propertyMultiLine="true"
-            ecoreFeature="ecore:EAttribute diagram.ecore#//description/GenericLayout/description"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diagram.ecore#//description/GenericLayout/layoutOptions"/>
+      <genClasses ecoreClass="diagram.ecore#//description/CustomLayoutConfiguration">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//description/CustomLayoutConfiguration/id"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//description/CustomLayoutConfiguration/label"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//description/CustomLayoutConfiguration/description"/>
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diagram.ecore#//description/CustomLayoutConfiguration/layoutOptions"/>
       </genClasses>
       <genClasses ecoreClass="diagram.ecore#//description/LayoutOption">
         <genFeatures property="None" createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//description/LayoutOption/id"/>
diff --git a/plugins/org.eclipse.sirius.editor.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.editor.diagram/META-INF/MANIFEST.MF
index 59510cda96..5c9a3aa376 100644
--- a/plugins/org.eclipse.sirius.editor.diagram/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.editor.diagram/META-INF/MANIFEST.MF
@@ -22,19 +22,26 @@ Bundle-Localization: plugin
 Export-Package: org.eclipse.sirius.diagram.editor.properties.filters.concern.concerndescription;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.description.abstractnodemapping;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.description.additionallayer;version="2.0.4",
+ org.eclipse.sirius.diagram.editor.properties.filters.description.booleanlayoutoption;version="6.0.0",
  org.eclipse.sirius.diagram.editor.properties.filters.description.compositelayout;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.description.containermapping;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.description.containermappingimport;version="2.0.4",
+ org.eclipse.sirius.diagram.editor.properties.filters.description.customlayoutconfiguration;version="6.0.0",
  org.eclipse.sirius.diagram.editor.properties.filters.description.diagramdescription;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.description.diagramelementmapping;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.description.diagramimportdescription;version="2.0.4",
+ org.eclipse.sirius.diagram.editor.properties.filters.description.doublelayoutoption;version="6.0.0",
  org.eclipse.sirius.diagram.editor.properties.filters.description.draganddroptargetdescription;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.description.edgemapping;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.description.edgemappingimport;version="2.0.4",
+ org.eclipse.sirius.diagram.editor.properties.filters.description.enumlayoutvalue;version="6.0.0",
+ org.eclipse.sirius.diagram.editor.properties.filters.description.integerlayoutoption;version="6.0.0",
  org.eclipse.sirius.diagram.editor.properties.filters.description.layer;version="2.0.4",
+ org.eclipse.sirius.diagram.editor.properties.filters.description.layoutoption;version="6.0.0",
  org.eclipse.sirius.diagram.editor.properties.filters.description.mappingbaseddecoration;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.description.nodemappingimport;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.description.orderedtreelayout;version="2.0.4",
+ org.eclipse.sirius.diagram.editor.properties.filters.description.stringlayoutoption;version="6.0.0",
  org.eclipse.sirius.diagram.editor.properties.filters.filter.filter;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.filter.mappingfilter;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.filters.filter.variablefilter;version="2.0.4",
@@ -81,19 +88,26 @@ Export-Package: org.eclipse.sirius.diagram.editor.properties.filters.concern.con
  org.eclipse.sirius.diagram.editor.properties.sections.concern.concerndescription;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.sections.description.abstractnodemapping;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.sections.description.additionallayer;version="2.0.4",
+ org.eclipse.sirius.diagram.editor.properties.sections.description.booleanlayoutoption;version="6.0.0",
  org.eclipse.sirius.diagram.editor.properties.sections.description.compositelayout;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.sections.description.containermapping;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.sections.description.containermappingimport;version="2.0.4",
+ org.eclipse.sirius.diagram.editor.properties.sections.description.customlayoutconfiguration;version="6.0.0",
  org.eclipse.sirius.diagram.editor.properties.sections.description.diagramdescription;version="3.0.0",
  org.eclipse.sirius.diagram.editor.properties.sections.description.diagramelementmapping;version="3.0.0",
  org.eclipse.sirius.diagram.editor.properties.sections.description.diagramimportdescription;version="2.0.4",
+ org.eclipse.sirius.diagram.editor.properties.sections.description.doublelayoutoption;version="6.0.0",
  org.eclipse.sirius.diagram.editor.properties.sections.description.draganddroptargetdescription;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.sections.description.edgemapping;version="3.0.0",
  org.eclipse.sirius.diagram.editor.properties.sections.description.edgemappingimport;version="2.0.4",
+ org.eclipse.sirius.diagram.editor.properties.sections.description.enumlayoutvalue;version="6.0.0",
+ org.eclipse.sirius.diagram.editor.properties.sections.description.integerlayoutoption;version="6.0.0",
  org.eclipse.sirius.diagram.editor.properties.sections.description.layer;version="3.0.0",
+ org.eclipse.sirius.diagram.editor.properties.sections.description.layoutoption;version="6.0.0",
  org.eclipse.sirius.diagram.editor.properties.sections.description.mappingbaseddecoration;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.sections.description.nodemappingimport;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.sections.description.orderedtreelayout;version="3.0.0",
+ org.eclipse.sirius.diagram.editor.properties.sections.description.stringlayoutoption;version="6.0.0",
  org.eclipse.sirius.diagram.editor.properties.sections.filter.filter;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.sections.filter.mappingfilter;version="3.0.0",
  org.eclipse.sirius.diagram.editor.properties.sections.filter.variablefilter;version="3.0.0",
@@ -135,10 +149,10 @@ Export-Package: org.eclipse.sirius.diagram.editor.properties.filters.concern.con
  org.eclipse.sirius.diagram.editor.properties.sections.tool.requestdescription;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.sections.tool.toolgroupextension;version="2.0.4",
  org.eclipse.sirius.diagram.editor.properties.sections.tool.toolsection;version="3.0.0",
- org.eclipse.sirius.diagram.editor.tools.internal.editor;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.editor.tools.internal.menu.child;x-internal:=true;version="2.1.0",
- org.eclipse.sirius.diagram.editor.tools.internal.menu.refactoring;x-internal:=true;version="2.1.0",
- org.eclipse.sirius.diagram.editor.tools.internal.menu.refactoring.border;x-internal:=true;version="2.0.4"
+ org.eclipse.sirius.diagram.editor.tools.internal.editor;version="2.0.4";x-internal:=true,
+ org.eclipse.sirius.diagram.editor.tools.internal.menu.child;version="2.1.0";x-internal:=true,
+ org.eclipse.sirius.diagram.editor.tools.internal.menu.refactoring;version="2.1.0";x-internal:=true,
+ org.eclipse.sirius.diagram.editor.tools.internal.menu.refactoring.border;version="2.0.4";x-internal:=true
 Import-Package: org.eclipse.sirius.ext.base;version="2.0.0",
  org.eclipse.sirius.ext.swt;version="2.0.0"
 Automatic-Module-Name: org.eclipse.sirius.editor.diagram
diff --git a/plugins/org.eclipse.sirius.editor.diagram/help/contexts.xml b/plugins/org.eclipse.sirius.editor.diagram/help/contexts.xml
index ab9ac25146..eb42cbc811 100644
--- a/plugins/org.eclipse.sirius.editor.diagram/help/contexts.xml
+++ b/plugins/org.eclipse.sirius.editor.diagram/help/contexts.xml
@@ -1012,6 +1012,116 @@
    
       </description>
    </context>
+   <context id="CustomLayoutConfiguration">
+     <description>
+       
+       
+         
+   <!-- Start of user code CustomLayoutConfiguration description -->
+   
+   <!-- End of user code CustomLayoutConfiguration description -->
+   
+      </description>
+   </context>
+   <context id="LayoutOption">
+     <description>
+       
+       
+         
+   <!-- Start of user code LayoutOption description -->
+   
+   <!-- End of user code LayoutOption description -->
+   
+      </description>
+   </context>
+   <context id="BooleanLayoutOption">
+     <description>
+       
+       
+         
+   <!-- Start of user code BooleanLayoutOption description -->
+   
+   <!-- End of user code BooleanLayoutOption description -->
+   
+      </description>
+   </context>
+   <context id="StringLayoutOption">
+     <description>
+       
+       
+         
+   <!-- Start of user code StringLayoutOption description -->
+   
+   <!-- End of user code StringLayoutOption description -->
+   
+      </description>
+   </context>
+   <context id="IntegerLayoutOption">
+     <description>
+       
+       
+         
+   <!-- Start of user code IntegerLayoutOption description -->
+   
+   <!-- End of user code IntegerLayoutOption description -->
+   
+      </description>
+   </context>
+   <context id="DoubleLayoutOption">
+     <description>
+       
+       
+         
+   <!-- Start of user code DoubleLayoutOption description -->
+   
+   <!-- End of user code DoubleLayoutOption description -->
+   
+      </description>
+   </context>
+   <context id="EnumLayoutOption">
+     <description>
+       
+       
+         
+   <!-- Start of user code EnumLayoutOption description -->
+   
+   <!-- End of user code EnumLayoutOption description -->
+   
+      </description>
+   </context>
+   <context id="EnumSetLayoutOption">
+     <description>
+       
+       
+         
+   <!-- Start of user code EnumSetLayoutOption description -->
+   
+   <!-- End of user code EnumSetLayoutOption description -->
+   
+      </description>
+   </context>
+   <context id="EnumOption">
+     <description>
+       
+       
+         
+   <!-- Start of user code EnumOption description -->
+   
+   <!-- End of user code EnumOption description -->
+   
+      </description>
+   </context>
+   <context id="EnumLayoutValue">
+     <description>
+       
+       
+         
+   <!-- Start of user code EnumLayoutValue description -->
+   
+   <!-- End of user code EnumLayoutValue description -->
+   
+      </description>
+   </context>
    <context id="MappingBasedDecoration">
      <description>
        A MappingBasedDecoration applies decorations on views that are issued from one or more mappings.
diff --git a/plugins/org.eclipse.sirius.editor.diagram/plugin.xml b/plugins/org.eclipse.sirius.editor.diagram/plugin.xml
index 008be021a9..4c3d2ffe93 100644
--- a/plugins/org.eclipse.sirius.editor.diagram/plugin.xml
+++ b/plugins/org.eclipse.sirius.editor.diagram/plugin.xml
@@ -834,6 +834,81 @@
         <input type="org.eclipse.sirius.viewpoint.description.SemanticBasedDecoration"/>        
       </propertySection>
   	  <propertySection
+               class="org.eclipse.sirius.diagram.editor.properties.sections.description.enumlayoutvalue.EnumLayoutValueDescriptionPropertySection"
+               id="description.section.enumLayoutOption.Description"
+               filter="org.eclipse.sirius.diagram.editor.properties.filters.description.enumlayoutvalue.EnumLayoutValueDescriptionFilter"
+               afterSection="description.section.layoutOption.Value"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.diagram.description.EnumLayoutValue"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.diagram.editor.properties.sections.description.enumlayoutvalue.EnumLayoutValueNamePropertySection"
+               id="description.section.enumLayoutValue.Value"
+               filter="org.eclipse.sirius.diagram.editor.properties.filters.description.enumlayoutvalue.EnumLayoutValueNameFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.diagram.description.EnumLayoutValue"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.diagram.editor.properties.sections.description.doublelayoutoption.DoubleLayoutOptionValuePropertySection"
+               id="description.section.doubleLayoutOption.Value"
+               filter="org.eclipse.sirius.diagram.editor.properties.filters.description.doublelayoutoption.DoubleLayoutOptionValueFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.diagram.description.DoubleLayoutOption"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.diagram.editor.properties.sections.description.integerlayoutoption.IntegerLayoutOptionValuePropertySection"
+               id="description.section.integerLayoutOption.Value"
+               filter="org.eclipse.sirius.diagram.editor.properties.filters.description.integerlayoutoption.IntegerLayoutOptionValueFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.diagram.description.IntegerLayoutOption"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.diagram.editor.properties.sections.description.stringlayoutoption.StringLayoutOptionValuePropertySection"
+               id="description.section.stringLayoutOption.Value"
+               filter="org.eclipse.sirius.diagram.editor.properties.filters.description.stringlayoutoption.StringLayoutOptionValueFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.diagram.description.StringLayoutOption"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.diagram.editor.properties.sections.description.booleanlayoutoption.BooleanLayoutOptionValuePropertySection"
+               id="description.section.booleanLayoutOption.Value"
+               filter="org.eclipse.sirius.diagram.editor.properties.filters.description.booleanlayoutoption.BooleanLayoutOptionValueFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.diagram.description.BooleanLayoutOption"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.diagram.editor.properties.sections.description.layoutoption.LayoutOptionDescriptionPropertySection"
+               id="description.section.layoutOption.Description"
+               filter="org.eclipse.sirius.diagram.editor.properties.filters.description.layoutoption.LayoutOptionDescriptionFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.diagram.description.LayoutOption"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.diagram.editor.properties.sections.description.customlayoutconfiguration.CustomLayoutConfigurationDescriptionPropertySection"
+               id="description.section.customLayoutConfiguration.Description"
+               filter="org.eclipse.sirius.diagram.editor.properties.filters.description.customlayoutconfiguration.CustomLayoutConfigurationDescriptionFilter"
+               afterSection="description.section.customLayoutConfiguration.Label"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.diagram.description.CustomLayoutConfiguration"/>
+      </propertySection>
+      <!--
+  	  <propertySection
+               class="org.eclipse.sirius.diagram.editor.properties.sections.description.customlayoutconfiguration.CustomLayoutConfigurationLabelPropertySection"
+               id="description.section.customLayoutConfiguration.Label"
+               filter="org.eclipse.sirius.diagram.editor.properties.filters.description.customlayoutconfiguration.CustomLayoutConfigurationLabelFilter"
+               afterSection="description.section.customLayoutConfiguration.Id"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.diagram.description.CustomLayoutConfiguration"/>
+      </propertySection>
+  	  <propertySection
+               class="org.eclipse.sirius.diagram.editor.properties.sections.description.customlayoutconfiguration.CustomLayoutConfigurationIdPropertySection"
+               id="description.section.customLayoutConfiguration.Id"
+               filter="org.eclipse.sirius.diagram.editor.properties.filters.description.customlayoutconfiguration.CustomLayoutConfigurationIdFilter"
+                tab="viewpoint.tab.general">
+        <input type="org.eclipse.sirius.diagram.description.CustomLayoutConfiguration"/>
+      </propertySection>
+      -->
+  	  <propertySection
                class="org.eclipse.sirius.diagram.editor.properties.sections.description.compositelayout.CompositeLayoutDirectionPropertySection"
                id="description.section.compositeLayout.Direction"
                filter="org.eclipse.sirius.diagram.editor.properties.filters.description.compositelayout.CompositeLayoutDirectionFilter"
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/booleanlayoutoption/BooleanLayoutOptionValueFilter.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/booleanlayoutoption/BooleanLayoutOptionValueFilter.java
new file mode 100644
index 0000000000..e088813cf9
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/booleanlayoutoption/BooleanLayoutOptionValueFilter.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.filters.description.booleanlayoutoption;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+
+// End of user code specific imports
+
+/**
+ * A filter for the value property section.
+ */
+public class BooleanLayoutOptionValueFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    protected EStructuralFeature getFeature() {
+        return DescriptionPackage.eINSTANCE.getBooleanLayoutOption_Value();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.diagram.description.BooleanLayoutOption;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/customlayoutconfiguration/CustomLayoutConfigurationDescriptionFilter.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/customlayoutconfiguration/CustomLayoutConfigurationDescriptionFilter.java
new file mode 100644
index 0000000000..4cd12ef764
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/customlayoutconfiguration/CustomLayoutConfigurationDescriptionFilter.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.filters.description.customlayoutconfiguration;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+
+// End of user code specific imports
+
+/**
+ * A filter for the description property section.
+ */
+public class CustomLayoutConfigurationDescriptionFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    protected EStructuralFeature getFeature() {
+        return DescriptionPackage.eINSTANCE.getCustomLayoutConfiguration_Description();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.diagram.description.CustomLayoutConfiguration;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/customlayoutconfiguration/CustomLayoutConfigurationIdFilter.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/customlayoutconfiguration/CustomLayoutConfigurationIdFilter.java
new file mode 100644
index 0000000000..210713fadf
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/customlayoutconfiguration/CustomLayoutConfigurationIdFilter.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.filters.description.customlayoutconfiguration;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+
+// End of user code specific imports
+
+/**
+ * A filter for the id property section.
+ */
+public class CustomLayoutConfigurationIdFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    protected EStructuralFeature getFeature() {
+        return DescriptionPackage.eINSTANCE.getCustomLayoutConfiguration_Id();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.diagram.description.CustomLayoutConfiguration;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/customlayoutconfiguration/CustomLayoutConfigurationLabelFilter.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/customlayoutconfiguration/CustomLayoutConfigurationLabelFilter.java
new file mode 100644
index 0000000000..ad7f0edb82
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/customlayoutconfiguration/CustomLayoutConfigurationLabelFilter.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.filters.description.customlayoutconfiguration;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+
+// End of user code specific imports
+
+/**
+ * A filter for the label property section.
+ */
+public class CustomLayoutConfigurationLabelFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    protected EStructuralFeature getFeature() {
+        return DescriptionPackage.eINSTANCE.getCustomLayoutConfiguration_Label();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.diagram.description.CustomLayoutConfiguration;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/doublelayoutoption/DoubleLayoutOptionValueFilter.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/doublelayoutoption/DoubleLayoutOptionValueFilter.java
new file mode 100644
index 0000000000..4f36e59e11
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/doublelayoutoption/DoubleLayoutOptionValueFilter.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.filters.description.doublelayoutoption;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+
+// End of user code specific imports
+
+/**
+ * A filter for the value property section.
+ */
+public class DoubleLayoutOptionValueFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    protected EStructuralFeature getFeature() {
+        return DescriptionPackage.eINSTANCE.getDoubleLayoutOption_Value();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.diagram.description.DoubleLayoutOption;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/enumlayoutvalue/EnumLayoutValueDescriptionFilter.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/enumlayoutvalue/EnumLayoutValueDescriptionFilter.java
new file mode 100644
index 0000000000..ec7ad73b71
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/enumlayoutvalue/EnumLayoutValueDescriptionFilter.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.filters.description.enumlayoutvalue;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+
+// End of user code specific imports
+
+/**
+ * A filter for the description property section.
+ */
+public class EnumLayoutValueDescriptionFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    protected EStructuralFeature getFeature() {
+        return DescriptionPackage.eINSTANCE.getEnumLayoutValue_Description();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.diagram.description.EnumLayoutValue;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/enumlayoutvalue/EnumLayoutValueNameFilter.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/enumlayoutvalue/EnumLayoutValueNameFilter.java
new file mode 100644
index 0000000000..23baf98ed9
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/enumlayoutvalue/EnumLayoutValueNameFilter.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.filters.description.enumlayoutvalue;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+
+// End of user code specific imports
+
+/**
+ * A filter for the name property section.
+ */
+public class EnumLayoutValueNameFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    protected EStructuralFeature getFeature() {
+        return DescriptionPackage.eINSTANCE.getEnumLayoutValue_Name();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.diagram.description.EnumLayoutValue;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/integerlayoutoption/IntegerLayoutOptionValueFilter.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/integerlayoutoption/IntegerLayoutOptionValueFilter.java
new file mode 100644
index 0000000000..ec5f37622f
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/integerlayoutoption/IntegerLayoutOptionValueFilter.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.filters.description.integerlayoutoption;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+
+// End of user code specific imports
+
+/**
+ * A filter for the value property section.
+ */
+public class IntegerLayoutOptionValueFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    protected EStructuralFeature getFeature() {
+        return DescriptionPackage.eINSTANCE.getIntegerLayoutOption_Value();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.diagram.description.IntegerLayoutOption;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/layoutoption/LayoutOptionDescriptionFilter.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/layoutoption/LayoutOptionDescriptionFilter.java
new file mode 100644
index 0000000000..89a2530fd6
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/layoutoption/LayoutOptionDescriptionFilter.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.filters.description.layoutoption;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+
+// End of user code specific imports
+
+/**
+ * A filter for the description property section.
+ */
+public class LayoutOptionDescriptionFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    protected EStructuralFeature getFeature() {
+        return DescriptionPackage.eINSTANCE.getLayoutOption_Description();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.diagram.description.LayoutOption;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/stringlayoutoption/StringLayoutOptionValueFilter.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/stringlayoutoption/StringLayoutOptionValueFilter.java
new file mode 100644
index 0000000000..7b5fd76f32
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/filters/description/stringlayoutoption/StringLayoutOptionValueFilter.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.filters.description.stringlayoutoption;
+
+// Start of user code specific imports
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
+
+// End of user code specific imports
+
+/**
+ * A filter for the value property section.
+ */
+public class StringLayoutOptionValueFilter extends ViewpointPropertyFilter {
+
+    /**
+     * {@inheritDoc}
+     */
+    protected EStructuralFeature getFeature() {
+        return DescriptionPackage.eINSTANCE.getStringLayoutOption_Value();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isRightInputType(Object arg0) {
+        return arg0 instanceof org.eclipse.sirius.diagram.description.StringLayoutOption;
+    }
+
+    // Start of user code user methods
+
+    // End of user code user methods
+
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/booleanlayoutoption/BooleanLayoutOptionValuePropertySection.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/booleanlayoutoption/BooleanLayoutOptionValuePropertySection.java
new file mode 100644
index 0000000000..dd00b728f7
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/booleanlayoutoption/BooleanLayoutOptionValuePropertySection.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.sections.description.booleanlayoutoption;
+
+// Start of user code imports
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractCheckBoxPropertySection;
+// End of user code imports
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+/**
+ * A section for the value property of a BooleanLayoutOption object.
+ */
+public class BooleanLayoutOptionValuePropertySection extends AbstractCheckBoxPropertySection {
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractCheckBoxPropertySection#getDefaultLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "Value"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractCheckBoxPropertySection#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.diagram.editor.properties.sections.AbstractCheckBoxPropertySection#getFeature()
+     */
+    protected EAttribute getFeature() {
+        return DescriptionPackage.eINSTANCE.getBooleanLayoutOption_Value();
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractCheckBoxPropertySection#getFeatureAsInteger()
+     */
+    protected String getDefaultFeatureAsText() {
+        String value = new String();
+        if (eObject.eGet(getFeature()) != null)
+            value = toBoolean(eObject.eGet(getFeature()).toString()).toString();
+        return value;
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractCheckBoxPropertySection#getFeatureValue(int)
+     */
+    protected Object getFeatureValue(String newText) {
+        return toBoolean(newText);
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractCheckBoxPropertySection#isEqual(int)
+     */
+    protected boolean isEqual(String newText) {
+        boolean equal = true;
+        if (toBoolean(newText) != null)
+            equal = getFeatureAsText().equals(toBoolean(newText).toString());
+        else
+            refresh();
+        return equal;
+    }
+
+    /**
+     * Converts the given text to the boolean it represents if applicable.
+     * 
+     * @return The boolean the given text represents if applicable, <code>null</code> otherwise.
+     */
+    private Boolean toBoolean(String text) {
+        Boolean booleanValue = null;
+        if (text.toLowerCase().matches("true|false"))
+            booleanValue = Boolean.parseBoolean(text);
+        return booleanValue;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+    }
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/customlayoutconfiguration/CustomLayoutConfigurationDescriptionPropertySection.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/customlayoutconfiguration/CustomLayoutConfigurationDescriptionPropertySection.java
new file mode 100644
index 0000000000..c947e3f3e2
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/customlayoutconfiguration/CustomLayoutConfigurationDescriptionPropertySection.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.sections.description.customlayoutconfiguration;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
+
+// End of user code imports
+
+/**
+ * A section for the description property of a CustomLayoutConfiguration object.
+ */
+public class CustomLayoutConfigurationDescriptionPropertySection extends AbstractTextPropertySection {
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "Description"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#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.diagram.editor.properties.sections.AbstractTextPropertySection#getFeature()
+     */
+    public EAttribute getFeature() {
+        return DescriptionPackage.eINSTANCE.getCustomLayoutConfiguration_Description();
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
+     */
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
+     */
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+
+        // Start of user code create controls
+        text.setEditable(false);
+        text.setEnabled(false);
+        text.setBackground(SiriusEditor.getColorRegistry().get("lightgrey"));
+        // End of user code create controls
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected String getPropertyDescription() {
+        return "";
+    }
+
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/customlayoutconfiguration/CustomLayoutConfigurationIdPropertySection.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/customlayoutconfiguration/CustomLayoutConfigurationIdPropertySection.java
new file mode 100644
index 0000000000..ff44899663
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/customlayoutconfiguration/CustomLayoutConfigurationIdPropertySection.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.sections.description.customlayoutconfiguration;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the id property of a CustomLayoutConfiguration object.
+ */
+public class CustomLayoutConfigurationIdPropertySection extends AbstractTextPropertySection {
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "Id"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#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.diagram.editor.properties.sections.AbstractTextPropertySection#getFeature()
+     */
+    public EAttribute getFeature() {
+        return DescriptionPackage.eINSTANCE.getCustomLayoutConfiguration_Id();
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
+     */
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
+     */
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+
+        // Start of user code create controls
+
+        // End of user code create controls
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected String getPropertyDescription() {
+        return "";
+    }
+
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/customlayoutconfiguration/CustomLayoutConfigurationLabelPropertySection.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/customlayoutconfiguration/CustomLayoutConfigurationLabelPropertySection.java
new file mode 100644
index 0000000000..cd8e5572f5
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/customlayoutconfiguration/CustomLayoutConfigurationLabelPropertySection.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.sections.description.customlayoutconfiguration;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the label property of a CustomLayoutConfiguration object.
+ */
+public class CustomLayoutConfigurationLabelPropertySection extends AbstractTextPropertySection {
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "Label"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#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.diagram.editor.properties.sections.AbstractTextPropertySection#getFeature()
+     */
+    public EAttribute getFeature() {
+        return DescriptionPackage.eINSTANCE.getCustomLayoutConfiguration_Label();
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
+     */
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
+     */
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+
+        // Start of user code create controls
+
+        // End of user code create controls
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected String getPropertyDescription() {
+        return "";
+    }
+
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/doublelayoutoption/DoubleLayoutOptionValuePropertySection.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/doublelayoutoption/DoubleLayoutOptionValuePropertySection.java
new file mode 100644
index 0000000000..06432de7bd
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/doublelayoutoption/DoubleLayoutOptionValuePropertySection.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.sections.description.doublelayoutoption;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+/**
+ * A section for the value property of a DoubleLayoutOption object.
+ */
+public class DoubleLayoutOptionValuePropertySection extends AbstractTextPropertySection {
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "Value"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#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.diagram.editor.properties.sections.AbstractTextPropertySection#getFeature()
+     */
+    public EAttribute getFeature() {
+        return DescriptionPackage.eINSTANCE.getDoubleLayoutOption_Value();
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
+     */
+    protected Object getFeatureValue(String newText) {
+        return toDouble(newText);
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
+     */
+    protected boolean isEqual(String newText) {
+        boolean equal = true;
+        if (toDouble(newText) != null)
+            equal = getFeatureAsText().equals(toDouble(newText).toString());
+        else
+            refresh();
+        return equal;
+    }
+
+    /**
+     * Converts the given text to the double it represents if applicable.
+     * 
+     * @return The double the given text represents if applicable, <code>null</code> otherwise.
+     */
+    private Double toDouble(String text) {
+        Double doubleValue = null;
+        try {
+            doubleValue = new Double(text);
+        } catch (NumberFormatException e) {
+            // Not a Double
+        }
+        return doubleValue;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected String getPropertyDescription() {
+        // TODO value description
+        return null;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/enumlayoutvalue/EnumLayoutValueDescriptionPropertySection.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/enumlayoutvalue/EnumLayoutValueDescriptionPropertySection.java
new file mode 100644
index 0000000000..c783af57d3
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/enumlayoutvalue/EnumLayoutValueDescriptionPropertySection.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.sections.description.enumlayoutvalue;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the description property of a EnumLayoutValue object.
+ */
+public class EnumLayoutValueDescriptionPropertySection extends AbstractTextPropertySection {
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "Description"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#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.diagram.editor.properties.sections.AbstractTextPropertySection#getFeature()
+     */
+    public EAttribute getFeature() {
+        return DescriptionPackage.eINSTANCE.getEnumLayoutValue_Description();
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
+     */
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
+     */
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+
+        // Start of user code create controls
+        text.setEditable(false);
+        text.setEnabled(false);
+        text.setBackground(SiriusEditor.getColorRegistry().get("lightgrey"));
+        // End of user code create controls
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected String getPropertyDescription() {
+        return "";
+    }
+
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/enumlayoutvalue/EnumLayoutValueNamePropertySection.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/enumlayoutvalue/EnumLayoutValueNamePropertySection.java
new file mode 100644
index 0000000000..e5b87faa58
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/enumlayoutvalue/EnumLayoutValueNamePropertySection.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.sections.description.enumlayoutvalue;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the name property of a EnumLayoutValue object.
+ */
+public class EnumLayoutValueNamePropertySection extends AbstractTextPropertySection {
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "Name"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#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.diagram.editor.properties.sections.AbstractTextPropertySection#getFeature()
+     */
+    public EAttribute getFeature() {
+        return DescriptionPackage.eINSTANCE.getEnumLayoutValue_Name();
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
+     */
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
+     */
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+
+        // Start of user code create controls
+        text.setEditable(false);
+        text.setEnabled(false);
+        // End of user code create controls
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected String getPropertyDescription() {
+        return "";
+    }
+
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/integerlayoutoption/IntegerLayoutOptionValuePropertySection.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/integerlayoutoption/IntegerLayoutOptionValuePropertySection.java
new file mode 100644
index 0000000000..29b0e3c35e
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/integerlayoutoption/IntegerLayoutOptionValuePropertySection.java
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.sections.description.integerlayoutoption;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractSpinnerPropertySection;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+/**
+ * A section for the value property of a IntegerLayoutOption object.
+ */
+public class IntegerLayoutOptionValuePropertySection extends AbstractSpinnerPropertySection {
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractSpinnerPropertySection#getDefaultLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "Value"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractSpinnerPropertySection#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.diagram.editor.properties.sections.AbstractSpinnerPropertySection#getFeature()
+     */
+    protected EAttribute getFeature() {
+        return DescriptionPackage.eINSTANCE.getIntegerLayoutOption_Value();
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractSpinnerPropertySection#getFeatureAsInteger()
+     */
+    protected String getFeatureAsText() {
+        String value = new String();
+        if (eObject.eGet(getFeature()) != null)
+            value = toInteger(eObject.eGet(getFeature()).toString()).toString();
+        return value;
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractSpinnerPropertySection#isEqual(int)
+     */
+    protected boolean isEqual(String newText) {
+        boolean equal = true;
+        if (toInteger(newText) != null)
+            equal = getFeatureAsText().equals(toInteger(newText).toString());
+        else
+            refresh();
+        return equal;
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractSpinnerPropertySection#getFeatureValue(int)
+     */
+    protected Object getFeatureValue(String newText) {
+        return toInteger(newText);
+    }
+
+    /**
+     * Converts the given text to the integer it represents if applicable.
+     * 
+     * @return The integer the given text represents if applicable, <code>null</code> otherwise.
+     */
+    private Integer toInteger(String text) {
+        Integer integerValue = null;
+        try {
+            integerValue = new Integer(text);
+        } catch (NumberFormatException e) {
+            // Not a Integer
+        }
+        return integerValue;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+
+        // Start of user code create controls
+
+        // End of user code create controls
+    }
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/layoutoption/LayoutOptionDescriptionPropertySection.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/layoutoption/LayoutOptionDescriptionPropertySection.java
new file mode 100644
index 0000000000..7f3bc52371
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/layoutoption/LayoutOptionDescriptionPropertySection.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.sections.description.layoutoption;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractMultilinePropertySection;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the description property of a LayoutOption object.
+ */
+public class LayoutOptionDescriptionPropertySection extends AbstractMultilinePropertySection {
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractMultilinePropertySection#getDefaultLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "Description"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractMultilinePropertySection#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.diagram.editor.properties.sections.AbstractMultilinePropertySection#getFeature()
+     */
+    public EAttribute getFeature() {
+        return DescriptionPackage.eINSTANCE.getLayoutOption_Description();
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractMultilinePropertySection#getFeatureValue(String)
+     */
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractMultilinePropertySection#isEqual(String)
+     */
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+
+        // Start of user code create controls
+        text.setEditable(false);
+        text.setEnabled(false);
+        text.setBackground(SiriusEditor.getColorRegistry().get("lightgrey"));
+        // End of user code create controls
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected String getPropertyDescription() {
+        return "";
+    }
+
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/stringlayoutoption/StringLayoutOptionValuePropertySection.java b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/stringlayoutoption/StringLayoutOptionValuePropertySection.java
new file mode 100644
index 0000000000..6125d321dd
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor.diagram/src-gen/org/eclipse/sirius/diagram/editor/properties/sections/description/stringlayoutoption/StringLayoutOptionValuePropertySection.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2017 THALES GLOBAL SERVICES.
+ * 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.diagram.editor.properties.sections.description.stringlayoutoption;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
+import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+
+// End of user code imports
+
+/**
+ * A section for the value property of a StringLayoutOption object.
+ */
+public class StringLayoutOptionValuePropertySection extends AbstractTextPropertySection {
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getDefaultLabelText()
+     */
+    protected String getDefaultLabelText() {
+        return "Value"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#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.diagram.editor.properties.sections.AbstractTextPropertySection#getFeature()
+     */
+    public EAttribute getFeature() {
+        return DescriptionPackage.eINSTANCE.getStringLayoutOption_Value();
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#getFeatureValue(String)
+     */
+    protected Object getFeatureValue(String newText) {
+        return newText;
+    }
+
+    /**
+     * @see org.eclipse.sirius.diagram.editor.properties.sections.AbstractTextPropertySection#isEqual(String)
+     */
+    protected boolean isEqual(String newText) {
+        return getFeatureAsText().equals(newText);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
+        super.createControls(parent, tabbedPropertySheetPage);
+
+        // Start of user code create controls
+
+        // End of user code create controls
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected String getPropertyDescription() {
+        return "";
+    }
+
+    // Start of user code user operations
+
+    // End of user code user operations
+}
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/editorPlugin/SiriusEditor.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/editorPlugin/SiriusEditor.java
index a78f2ed7e2..f77b2f2b6d 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/editorPlugin/SiriusEditor.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/editorPlugin/SiriusEditor.java
@@ -1410,6 +1410,7 @@ public class SiriusEditor extends MultiPageEditorPart
             colorRegistry.put("light_blue", new RGB(212, 229, 247));
             // Start of user code put your own colors here
             colorRegistry.put("lightgreen", new RGB(227, 249, 204));
+            colorRegistry.put("lightgrey", new RGB(242, 242, 242));
             // End of user code put your own colors here
 
         }