411558: [Table 2] Papyrus must provide a property view for the new table

https://bugs.eclipse.org/bugs/show_bug.cgi?id=411558 Add the composite to manage the label of the columns
author: vlorenzo 2013-06-27 13:58:41 +0000
committer: vlorenzo 2013-06-27 13:58:41 +0000
commit: a8db40932a4717da231b58535aeec3e28910ebc4 (patch)
tree: 7426b6cb05cfd91d83e05c0c74b00b094c0669d7 /extraplugins
parent: 2a197d50a20424f89052ceee4a94ef5a2e4bf7fc (diff)
download: org.eclipse.papyrus-a8db40932a4717da231b58535aeec3e28910ebc4.tar.gz
org.eclipse.papyrus-a8db40932a4717da231b58535aeec3e28910ebc4.tar.xz
org.eclipse.papyrus-a8db40932a4717da231b58535aeec3e28910ebc4.zip
24 files changed, 3064 insertions, 822 deletions
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
index e633a939ac8..bb48bb7ef13 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
@@ -19,6 +19,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.nattable.model,
  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
  org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0"
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.constraints;bundle-version="0.10.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.papyrus.infra.nattable.properties.constraints
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/nattable.ctx b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/nattable.ctx
index 26e0301c9fe..405412ffb40 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/nattable.ctx
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/nattable.ctx
@@ -1,799 +1,2088 @@
 <?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9">
-  <contexts:Context name="nattable">
-    <tabs label="Table" id="Table" category="default" priority="1">
-      <sections name="Single Table" sectionFile="ui/SingleTable.xwt">
-        <widget href="ui/SingleTable.xwt#/"/>
-      </sections>
-      <sections name="Multiple Table" sectionFile="ui/MultipleTable.xwt">
-        <widget href="ui/MultipleTable.xwt#/"/>
-      </sections>
-      <sections name="Single TableConfiguration" sectionFile="ui/SingleTableConfiguration.xwt">
-        <widget href="ui/SingleTableConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Multiple TableConfiguration" sectionFile="ui/MultipleTableConfiguration.xwt">
-        <widget href="ui/MultipleTableConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Single AbstractAxisProvider" sectionFile="ui/SingleAbstractAxisProvider.xwt">
-        <widget href="ui/SingleAbstractAxisProvider.xwt#/"/>
-      </sections>
-      <sections name="Multiple AbstractAxisProvider" sectionFile="ui/MultipleAbstractAxisProvider.xwt">
-        <widget href="ui/MultipleAbstractAxisProvider.xwt#/"/>
-      </sections>
-      <sections name="Single AxisProvider" sectionFile="ui/SingleAxisProvider.xwt">
-        <widget href="ui/SingleAxisProvider.xwt#/"/>
-      </sections>
-      <sections name="Multiple AxisProvider" sectionFile="ui/MultipleAxisProvider.xwt">
-        <widget href="ui/MultipleAxisProvider.xwt#/"/>
-      </sections>
-      <sections name="Single IMasterAxisProvider" sectionFile="ui/SingleIMasterAxisProvider.xwt">
-        <widget href="ui/SingleIMasterAxisProvider.xwt#/"/>
-      </sections>
-      <sections name="Multiple IMasterAxisProvider" sectionFile="ui/MultipleIMasterAxisProvider.xwt">
-        <widget href="ui/MultipleIMasterAxisProvider.xwt#/"/>
-      </sections>
-      <sections name="Single ISlaveAxisProvider" sectionFile="ui/SingleISlaveAxisProvider.xwt">
-        <widget href="ui/SingleISlaveAxisProvider.xwt#/"/>
-      </sections>
-      <sections name="Multiple ISlaveAxisProvider" sectionFile="ui/MultipleISlaveAxisProvider.xwt">
-        <widget href="ui/MultipleISlaveAxisProvider.xwt#/"/>
-      </sections>
-      <sections name="Single SlaveObjectAxisProvider" sectionFile="ui/SingleSlaveObjectAxisProvider.xwt">
-        <widget href="ui/SingleSlaveObjectAxisProvider.xwt#/"/>
-      </sections>
-      <sections name="Multiple SlaveObjectAxisProvider" sectionFile="ui/MultipleSlaveObjectAxisProvider.xwt">
-        <widget href="ui/MultipleSlaveObjectAxisProvider.xwt#/"/>
-      </sections>
-      <sections name="Single MasterObjectAxisProvider" sectionFile="ui/SingleMasterObjectAxisProvider.xwt">
-        <widget href="ui/SingleMasterObjectAxisProvider.xwt#/"/>
-      </sections>
-      <sections name="Multiple MasterObjectAxisProvider" sectionFile="ui/MultipleMasterObjectAxisProvider.xwt">
-        <widget href="ui/MultipleMasterObjectAxisProvider.xwt#/"/>
-      </sections>
-      <sections name="Single ILabelProviderConfiguration" sectionFile="ui/SingleILabelProviderConfiguration.xwt">
-        <widget href="ui/SingleILabelProviderConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Multiple ILabelProviderConfiguration" sectionFile="ui/MultipleILabelProviderConfiguration.xwt">
-        <widget href="ui/MultipleILabelProviderConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Single ObjectLabelProviderConfiguration" sectionFile="ui/SingleObjectLabelProviderConfiguration.xwt">
-        <widget href="ui/SingleObjectLabelProviderConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Multiple ObjectLabelProviderConfiguration" sectionFile="ui/MultipleObjectLabelProviderConfiguration.xwt">
-        <widget href="ui/MultipleObjectLabelProviderConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Single FeatureLabelProviderConfiguration" sectionFile="ui/SingleFeatureLabelProviderConfiguration.xwt">
-        <widget href="ui/SingleFeatureLabelProviderConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Multiple FeatureLabelProviderConfiguration" sectionFile="ui/MultipleFeatureLabelProviderConfiguration.xwt">
-        <widget href="ui/MultipleFeatureLabelProviderConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Single AbstractHeaderAxisConfiguration" sectionFile="ui/SingleAbstractHeaderAxisConfiguration.xwt">
-        <widget href="ui/SingleAbstractHeaderAxisConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Multiple AbstractHeaderAxisConfiguration" sectionFile="ui/MultipleAbstractHeaderAxisConfiguration.xwt">
-        <widget href="ui/MultipleAbstractHeaderAxisConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Single AxisManagerRepresentation" sectionFile="ui/SingleAxisManagerRepresentation.xwt">
-        <widget href="ui/SingleAxisManagerRepresentation.xwt#/"/>
-      </sections>
-      <sections name="Multiple AxisManagerRepresentation" sectionFile="ui/MultipleAxisManagerRepresentation.xwt">
-        <widget href="ui/MultipleAxisManagerRepresentation.xwt#/"/>
-      </sections>
-      <sections name="Single AxisManagerConfiguration" sectionFile="ui/SingleAxisManagerConfiguration.xwt">
-        <widget href="ui/SingleAxisManagerConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Multiple AxisManagerConfiguration" sectionFile="ui/MultipleAxisManagerConfiguration.xwt">
-        <widget href="ui/MultipleAxisManagerConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Single TableHeaderAxisConfiguration" sectionFile="ui/SingleTableHeaderAxisConfiguration.xwt">
-        <widget href="ui/SingleTableHeaderAxisConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Multiple TableHeaderAxisConfiguration" sectionFile="ui/MultipleTableHeaderAxisConfiguration.xwt">
-        <widget href="ui/MultipleTableHeaderAxisConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Single LocalTableHeaderAxisConfiguration" sectionFile="ui/SingleLocalTableHeaderAxisConfiguration.xwt">
-        <widget href="ui/SingleLocalTableHeaderAxisConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Multiple LocalTableHeaderAxisConfiguration" sectionFile="ui/MultipleLocalTableHeaderAxisConfiguration.xwt">
-        <widget href="ui/MultipleLocalTableHeaderAxisConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Single IAxisConfiguration" sectionFile="ui/SingleIAxisConfiguration.xwt">
-        <widget href="ui/SingleIAxisConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Multiple IAxisConfiguration" sectionFile="ui/MultipleIAxisConfiguration.xwt">
-        <widget href="ui/MultipleIAxisConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Single FeatureAxisConfiguration" sectionFile="ui/SingleFeatureAxisConfiguration.xwt">
-        <widget href="ui/SingleFeatureAxisConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Multiple FeatureAxisConfiguration" sectionFile="ui/MultipleFeatureAxisConfiguration.xwt">
-        <widget href="ui/MultipleFeatureAxisConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Single IFillingConfiguration" sectionFile="ui/SingleIFillingConfiguration.xwt">
-        <widget href="ui/SingleIFillingConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Multiple IFillingConfiguration" sectionFile="ui/MultipleIFillingConfiguration.xwt">
-        <widget href="ui/MultipleIFillingConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Single EStructuralFeatureValueFillingConfiguration" sectionFile="ui/SingleEStructuralFeatureValueFillingConfiguration.xwt">
-        <widget href="ui/SingleEStructuralFeatureValueFillingConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Multiple EStructuralFeatureValueFillingConfiguration" sectionFile="ui/MultipleEStructuralFeatureValueFillingConfiguration.xwt">
-        <widget href="ui/MultipleEStructuralFeatureValueFillingConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Single IPasteConfiguration" sectionFile="ui/SingleIPasteConfiguration.xwt">
-        <widget href="ui/SingleIPasteConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Multiple IPasteConfiguration" sectionFile="ui/MultipleIPasteConfiguration.xwt">
-        <widget href="ui/MultipleIPasteConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Single PasteEObjectConfiguration" sectionFile="ui/SinglePasteEObjectConfiguration.xwt">
-        <widget href="ui/SinglePasteEObjectConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Multiple PasteEObjectConfiguration" sectionFile="ui/MultiplePasteEObjectConfiguration.xwt">
-        <widget href="ui/MultiplePasteEObjectConfiguration.xwt#/"/>
-      </sections>
-      <sections name="Single AbstractTableTester" sectionFile="ui/SingleAbstractTableTester.xwt">
-        <widget href="ui/SingleAbstractTableTester.xwt#/"/>
-      </sections>
-      <sections name="Multiple AbstractTableTester" sectionFile="ui/MultipleAbstractTableTester.xwt">
-        <widget href="ui/MultipleAbstractTableTester.xwt#/"/>
-      </sections>
-      <sections name="Single JavaTableTester" sectionFile="ui/SingleJavaTableTester.xwt">
-        <widget href="ui/SingleJavaTableTester.xwt#/"/>
-      </sections>
-      <sections name="Multiple JavaTableTester" sectionFile="ui/MultipleJavaTableTester.xwt">
-        <widget href="ui/MultipleJavaTableTester.xwt#/"/>
-      </sections>
-      <sections name="Single IAxis" sectionFile="ui/SingleIAxis.xwt">
-        <widget href="ui/SingleIAxis.xwt#/"/>
-      </sections>
-      <sections name="Multiple IAxis" sectionFile="ui/MultipleIAxis.xwt">
-        <widget href="ui/MultipleIAxis.xwt#/"/>
-      </sections>
-      <sections name="Single IdAxis" sectionFile="ui/SingleIdAxis.xwt">
-        <widget href="ui/SingleIdAxis.xwt#/"/>
-      </sections>
-      <sections name="Multiple IdAxis" sectionFile="ui/MultipleIdAxis.xwt">
-        <widget href="ui/MultipleIdAxis.xwt#/"/>
-      </sections>
-      <sections name="Single ObjectAxis" sectionFile="ui/SingleObjectAxis.xwt">
-        <widget href="ui/SingleObjectAxis.xwt#/"/>
-      </sections>
-      <sections name="Multiple ObjectAxis" sectionFile="ui/MultipleObjectAxis.xwt">
-        <widget href="ui/MultipleObjectAxis.xwt#/"/>
-      </sections>
-      <sections name="Single EObjectAxis" sectionFile="ui/SingleEObjectAxis.xwt">
-        <widget href="ui/SingleEObjectAxis.xwt#/"/>
-      </sections>
-      <sections name="Multiple EObjectAxis" sectionFile="ui/MultipleEObjectAxis.xwt">
-        <widget href="ui/MultipleEObjectAxis.xwt#/"/>
-      </sections>
-      <sections name="Single FeatureAxis" sectionFile="ui/SingleFeatureAxis.xwt">
-        <widget href="ui/SingleFeatureAxis.xwt#/"/>
-      </sections>
-      <sections name="Multiple FeatureAxis" sectionFile="ui/MultipleFeatureAxis.xwt">
-        <widget href="ui/MultipleFeatureAxis.xwt#/"/>
-      </sections>
-      <sections name="Single FeatureIdAxis" sectionFile="ui/SingleFeatureIdAxis.xwt">
-        <widget href="ui/SingleFeatureIdAxis.xwt#/"/>
-      </sections>
-      <sections name="Multiple FeatureIdAxis" sectionFile="ui/MultipleFeatureIdAxis.xwt">
-        <widget href="ui/MultipleFeatureIdAxis.xwt#/"/>
-      </sections>
-      <sections name="Single EStructuralFeatureAxis" sectionFile="ui/SingleEStructuralFeatureAxis.xwt">
-        <widget href="ui/SingleEStructuralFeatureAxis.xwt#/"/>
-      </sections>
-      <sections name="Multiple EStructuralFeatureAxis" sectionFile="ui/MultipleEStructuralFeatureAxis.xwt">
-        <widget href="ui/MultipleEStructuralFeatureAxis.xwt#/"/>
-      </sections>
-      <sections name="Single ObjectIdAxis" sectionFile="ui/SingleObjectIdAxis.xwt">
-        <widget href="ui/SingleObjectIdAxis.xwt#/"/>
-      </sections>
-      <sections name="Multiple ObjectIdAxis" sectionFile="ui/MultipleObjectIdAxis.xwt">
-        <widget href="ui/MultipleObjectIdAxis.xwt#/"/>
+<xmi:XMI xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9"
+    xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9">
+  <contexts:Context
+      name="nattable">
+    <tabs label="Table"
+        id="Table"
+        category="default"
+        priority="1">
+      <sections
+          name="Single Table"
+          sectionFile="ui/SingleTable.xwt">
+        <widget
+            href="ui/SingleTable.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple Table"
+          sectionFile="ui/MultipleTable.xwt">
+        <widget
+            href="ui/MultipleTable.xwt#/"/>
+      </sections>
+      <sections
+          name="Single TableConfiguration"
+          sectionFile="ui/SingleTableConfiguration.xwt">
+        <widget
+            href="ui/SingleTableConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple TableConfiguration"
+          sectionFile="ui/MultipleTableConfiguration.xwt">
+        <widget
+            href="ui/MultipleTableConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Single AbstractAxisProvider"
+          sectionFile="ui/SingleAbstractAxisProvider.xwt">
+        <widget
+            href="ui/SingleAbstractAxisProvider.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple AbstractAxisProvider"
+          sectionFile="ui/MultipleAbstractAxisProvider.xwt">
+        <widget
+            href="ui/MultipleAbstractAxisProvider.xwt#/"/>
+      </sections>
+      <sections
+          name="Single AxisProvider"
+          sectionFile="ui/SingleAxisProvider.xwt">
+        <widget
+            href="ui/SingleAxisProvider.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple AxisProvider"
+          sectionFile="ui/MultipleAxisProvider.xwt">
+        <widget
+            href="ui/MultipleAxisProvider.xwt#/"/>
+      </sections>
+      <sections
+          name="Single IMasterAxisProvider"
+          sectionFile="ui/SingleIMasterAxisProvider.xwt">
+        <widget
+            href="ui/SingleIMasterAxisProvider.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple IMasterAxisProvider"
+          sectionFile="ui/MultipleIMasterAxisProvider.xwt">
+        <widget
+            href="ui/MultipleIMasterAxisProvider.xwt#/"/>
+      </sections>
+      <sections
+          name="Single ISlaveAxisProvider"
+          sectionFile="ui/SingleISlaveAxisProvider.xwt">
+        <widget
+            href="ui/SingleISlaveAxisProvider.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple ISlaveAxisProvider"
+          sectionFile="ui/MultipleISlaveAxisProvider.xwt">
+        <widget
+            href="ui/MultipleISlaveAxisProvider.xwt#/"/>
+      </sections>
+      <sections
+          name="Single SlaveObjectAxisProvider"
+          sectionFile="ui/SingleSlaveObjectAxisProvider.xwt">
+        <widget
+            href="ui/SingleSlaveObjectAxisProvider.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple SlaveObjectAxisProvider"
+          sectionFile="ui/MultipleSlaveObjectAxisProvider.xwt">
+        <widget
+            href="ui/MultipleSlaveObjectAxisProvider.xwt#/"/>
+      </sections>
+      <sections
+          name="Single MasterObjectAxisProvider"
+          sectionFile="ui/SingleMasterObjectAxisProvider.xwt">
+        <widget
+            href="ui/SingleMasterObjectAxisProvider.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple MasterObjectAxisProvider"
+          sectionFile="ui/MultipleMasterObjectAxisProvider.xwt">
+        <widget
+            href="ui/MultipleMasterObjectAxisProvider.xwt#/"/>
+      </sections>
+      <sections
+          name="Single ILabelProviderConfiguration"
+          sectionFile="ui/SingleILabelProviderConfiguration.xwt">
+        <widget
+            href="ui/SingleILabelProviderConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple ILabelProviderConfiguration"
+          sectionFile="ui/MultipleILabelProviderConfiguration.xwt">
+        <widget
+            href="ui/MultipleILabelProviderConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Single ObjectLabelProviderConfiguration"
+          sectionFile="ui/SingleObjectLabelProviderConfiguration.xwt">
+        <widget
+            href="ui/SingleObjectLabelProviderConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple ObjectLabelProviderConfiguration"
+          sectionFile="ui/MultipleObjectLabelProviderConfiguration.xwt">
+        <widget
+            href="ui/MultipleObjectLabelProviderConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Single FeatureLabelProviderConfiguration"
+          sectionFile="ui/SingleFeatureLabelProviderConfiguration.xwt">
+        <widget
+            href="ui/SingleFeatureLabelProviderConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple FeatureLabelProviderConfiguration"
+          sectionFile="ui/MultipleFeatureLabelProviderConfiguration.xwt">
+        <widget
+            href="ui/MultipleFeatureLabelProviderConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Single AbstractHeaderAxisConfiguration"
+          sectionFile="ui/SingleAbstractHeaderAxisConfiguration.xwt">
+        <widget
+            href="ui/SingleAbstractHeaderAxisConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple AbstractHeaderAxisConfiguration"
+          sectionFile="ui/MultipleAbstractHeaderAxisConfiguration.xwt">
+        <widget
+            href="ui/MultipleAbstractHeaderAxisConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Single AxisManagerRepresentation"
+          sectionFile="ui/SingleAxisManagerRepresentation.xwt">
+        <widget
+            href="ui/SingleAxisManagerRepresentation.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple AxisManagerRepresentation"
+          sectionFile="ui/MultipleAxisManagerRepresentation.xwt">
+        <widget
+            href="ui/MultipleAxisManagerRepresentation.xwt#/"/>
+      </sections>
+      <sections
+          name="Single AxisManagerConfiguration"
+          sectionFile="ui/SingleAxisManagerConfiguration.xwt">
+        <widget
+            href="ui/SingleAxisManagerConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple AxisManagerConfiguration"
+          sectionFile="ui/MultipleAxisManagerConfiguration.xwt">
+        <widget
+            href="ui/MultipleAxisManagerConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Single TableHeaderAxisConfiguration"
+          sectionFile="ui/SingleTableHeaderAxisConfiguration.xwt">
+        <widget
+            href="ui/SingleTableHeaderAxisConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple TableHeaderAxisConfiguration"
+          sectionFile="ui/MultipleTableHeaderAxisConfiguration.xwt">
+        <widget
+            href="ui/MultipleTableHeaderAxisConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Single LocalTableHeaderAxisConfiguration"
+          sectionFile="ui/SingleLocalTableHeaderAxisConfiguration.xwt">
+        <widget
+            href="ui/SingleLocalTableHeaderAxisConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple LocalTableHeaderAxisConfiguration"
+          sectionFile="ui/MultipleLocalTableHeaderAxisConfiguration.xwt">
+        <widget
+            href="ui/MultipleLocalTableHeaderAxisConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Single IAxisConfiguration"
+          sectionFile="ui/SingleIAxisConfiguration.xwt">
+        <widget
+            href="ui/SingleIAxisConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple IAxisConfiguration"
+          sectionFile="ui/MultipleIAxisConfiguration.xwt">
+        <widget
+            href="ui/MultipleIAxisConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Single FeatureAxisConfiguration"
+          sectionFile="ui/SingleFeatureAxisConfiguration.xwt">
+        <widget
+            href="ui/SingleFeatureAxisConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple FeatureAxisConfiguration"
+          sectionFile="ui/MultipleFeatureAxisConfiguration.xwt">
+        <widget
+            href="ui/MultipleFeatureAxisConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Single IFillingConfiguration"
+          sectionFile="ui/SingleIFillingConfiguration.xwt">
+        <widget
+            href="ui/SingleIFillingConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple IFillingConfiguration"
+          sectionFile="ui/MultipleIFillingConfiguration.xwt">
+        <widget
+            href="ui/MultipleIFillingConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Single EStructuralFeatureValueFillingConfiguration"
+          sectionFile="ui/SingleEStructuralFeatureValueFillingConfiguration.xwt">
+        <widget
+            href="ui/SingleEStructuralFeatureValueFillingConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple EStructuralFeatureValueFillingConfiguration"
+          sectionFile="ui/MultipleEStructuralFeatureValueFillingConfiguration.xwt">
+        <widget
+            href="ui/MultipleEStructuralFeatureValueFillingConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Single IPasteConfiguration"
+          sectionFile="ui/SingleIPasteConfiguration.xwt">
+        <widget
+            href="ui/SingleIPasteConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple IPasteConfiguration"
+          sectionFile="ui/MultipleIPasteConfiguration.xwt">
+        <widget
+            href="ui/MultipleIPasteConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Single PasteEObjectConfiguration"
+          sectionFile="ui/SinglePasteEObjectConfiguration.xwt">
+        <widget
+            href="ui/SinglePasteEObjectConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple PasteEObjectConfiguration"
+          sectionFile="ui/MultiplePasteEObjectConfiguration.xwt">
+        <widget
+            href="ui/MultiplePasteEObjectConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="Single AbstractTableTester"
+          sectionFile="ui/SingleAbstractTableTester.xwt">
+        <widget
+            href="ui/SingleAbstractTableTester.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple AbstractTableTester"
+          sectionFile="ui/MultipleAbstractTableTester.xwt">
+        <widget
+            href="ui/MultipleAbstractTableTester.xwt#/"/>
+      </sections>
+      <sections
+          name="Single JavaTableTester"
+          sectionFile="ui/SingleJavaTableTester.xwt">
+        <widget
+            href="ui/SingleJavaTableTester.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple JavaTableTester"
+          sectionFile="ui/MultipleJavaTableTester.xwt">
+        <widget
+            href="ui/MultipleJavaTableTester.xwt#/"/>
+      </sections>
+      <sections
+          name="Single IAxis"
+          sectionFile="ui/SingleIAxis.xwt">
+        <widget
+            href="ui/SingleIAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple IAxis"
+          sectionFile="ui/MultipleIAxis.xwt">
+        <widget
+            href="ui/MultipleIAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Single IdAxis"
+          sectionFile="ui/SingleIdAxis.xwt">
+        <widget
+            href="ui/SingleIdAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple IdAxis"
+          sectionFile="ui/MultipleIdAxis.xwt">
+        <widget
+            href="ui/MultipleIdAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Single ObjectAxis"
+          sectionFile="ui/SingleObjectAxis.xwt">
+        <widget
+            href="ui/SingleObjectAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple ObjectAxis"
+          sectionFile="ui/MultipleObjectAxis.xwt">
+        <widget
+            href="ui/MultipleObjectAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Single EObjectAxis"
+          sectionFile="ui/SingleEObjectAxis.xwt">
+        <widget
+            href="ui/SingleEObjectAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple EObjectAxis"
+          sectionFile="ui/MultipleEObjectAxis.xwt">
+        <widget
+            href="ui/MultipleEObjectAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Single FeatureAxis"
+          sectionFile="ui/SingleFeatureAxis.xwt">
+        <widget
+            href="ui/SingleFeatureAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple FeatureAxis"
+          sectionFile="ui/MultipleFeatureAxis.xwt">
+        <widget
+            href="ui/MultipleFeatureAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Single FeatureIdAxis"
+          sectionFile="ui/SingleFeatureIdAxis.xwt">
+        <widget
+            href="ui/SingleFeatureIdAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple FeatureIdAxis"
+          sectionFile="ui/MultipleFeatureIdAxis.xwt">
+        <widget
+            href="ui/MultipleFeatureIdAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Single EStructuralFeatureAxis"
+          sectionFile="ui/SingleEStructuralFeatureAxis.xwt">
+        <widget
+            href="ui/SingleEStructuralFeatureAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple EStructuralFeatureAxis"
+          sectionFile="ui/MultipleEStructuralFeatureAxis.xwt">
+        <widget
+            href="ui/MultipleEStructuralFeatureAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Single ObjectIdAxis"
+          sectionFile="ui/SingleObjectIdAxis.xwt">
+        <widget
+            href="ui/SingleObjectIdAxis.xwt#/"/>
+      </sections>
+      <sections
+          name="Multiple ObjectIdAxis"
+          sectionFile="ui/MultipleObjectIdAxis.xwt">
+        <widget
+            href="ui/MultipleObjectIdAxis.xwt#/"/>
       </sections>
     </tabs>
-    <tabs label="Appearance" id="TableAppearance" category="default" afterTab="/0/@tabs.0">
-      <sections name="SingleTableAppearance" sectionFile="ui/SingleTableAppearance.xwt">
-        <widget href="ui/SingleTableAppearance.xwt#/"/>
+    <tabs label="Appearance"
+        id="TableAppearance"
+        category="default"
+        afterTab="/0/@tabs.0">
+      <sections
+          name="SingleTableAppearance"
+          sectionFile="ui/SingleTableAppearance.xwt">
+        <widget
+            href="ui/SingleTableAppearance.xwt#/"/>
+      </sections>
+      <sections
+          name="ColumnFeatureLabelProviderConfiguration"
+          sectionFile="ui/ColumnFeatureLabelProviderConfiguration.xwt">
+        <constraints
+            xsi:type="constraints:SimpleConstraint"
+            name="hasColumnFeatureLabelConfigurationConstraint"
+            overrideable="false">
+          <constraintType
+              href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.4"/>
+          <properties
+              xsi:type="constraints:ValueProperty"
+              name="className"
+              value="org.eclipse.papyrus.infra.nattable.properties.constraints.HasColumnFeatureLabelConfigurationConstraint"/>
+        </constraints>
+        <widget
+            href="ui/ColumnFeatureLabelProviderConfiguration.xwt#/"/>
+      </sections>
+      <sections
+          name="ColumnObjectLabelProviderConfiguration"
+          sectionFile="ui/ColumnObjectLabelProviderConfiguration.xwt">
+        <constraints
+            xsi:type="constraints:SimpleConstraint"
+            name="hasColumnObjectLabelConfigurationConstraint"
+            overrideable="false">
+          <constraintType
+              href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.4"/>
+          <properties
+              xsi:type="constraints:ValueProperty"
+              name="className"
+              value="org.eclipse.papyrus.infra.nattable.properties.constraints.HasColumnObjectLabelConfigurationConstraint"/>
+        </constraints>
+        <widget
+            href="ui/ColumnObjectLabelProviderConfiguration.xwt#/"/>
       </sections>
     </tabs>
-    <views name="Single Table" sections="/0/@tabs.0/@sections.0" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.0">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleTable">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="Table"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple Table" sections="/0/@tabs.0/@sections.1" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.0">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleTable">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="Table"/>
-      </constraints>
-    </views>
-    <views name="Single TableConfiguration" sections="/0/@tabs.0/@sections.2" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.1/@elements.1">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleTableConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="TableConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple TableConfiguration" sections="/0/@tabs.0/@sections.3" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.1/@elements.1">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleTableConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="TableConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"/>
-      </constraints>
-    </views>
-    <views name="Single AbstractAxisProvider" sections="/0/@tabs.0/@sections.4" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.2/@elements.0">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleAbstractAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="AbstractAxisProvider"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple AbstractAxisProvider" sections="/0/@tabs.0/@sections.5" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.2/@elements.0">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleAbstractAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="AbstractAxisProvider"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
-      </constraints>
-    </views>
-    <views name="Single AxisProvider" sections="/0/@tabs.0/@sections.6" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.2/@elements.3">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="AxisProvider"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple AxisProvider" sections="/0/@tabs.0/@sections.7" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.2/@elements.3">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="AxisProvider"/>
-      </constraints>
-    </views>
-    <views name="Single IMasterAxisProvider" sections="/0/@tabs.0/@sections.8" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.2/@elements.1">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleIMasterAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="IMasterAxisProvider"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple IMasterAxisProvider" sections="/0/@tabs.0/@sections.9" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.2/@elements.1">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleIMasterAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="IMasterAxisProvider"/>
-      </constraints>
-    </views>
-    <views name="Single ISlaveAxisProvider" sections="/0/@tabs.0/@sections.10" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.2/@elements.2">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleISlaveAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="ISlaveAxisProvider"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple ISlaveAxisProvider" sections="/0/@tabs.0/@sections.11" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.2/@elements.2">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleISlaveAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="ISlaveAxisProvider"/>
-      </constraints>
-    </views>
-    <views name="Single SlaveObjectAxisProvider" sections="/0/@tabs.0/@sections.12" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.2/@elements.4">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleSlaveObjectAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="SlaveObjectAxisProvider"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple SlaveObjectAxisProvider" sections="/0/@tabs.0/@sections.13" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.2/@elements.4">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleSlaveObjectAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="SlaveObjectAxisProvider"/>
-      </constraints>
-    </views>
-    <views name="Single MasterObjectAxisProvider" sections="/0/@tabs.0/@sections.14" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.2/@elements.5">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleMasterObjectAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="MasterObjectAxisProvider"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple MasterObjectAxisProvider" sections="/0/@tabs.0/@sections.15" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.2/@elements.5">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleMasterObjectAxisProvider">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="MasterObjectAxisProvider"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
-      </constraints>
-    </views>
-    <views name="Single ILabelProviderConfiguration" sections="/0/@tabs.0/@sections.16" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.3/@elements.0">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleILabelProviderConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="ILabelProviderConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple ILabelProviderConfiguration" sections="/0/@tabs.0/@sections.17" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.3/@elements.0">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleILabelProviderConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="ILabelProviderConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
-      </constraints>
-    </views>
-    <views name="Single ObjectLabelProviderConfiguration" sections="/0/@tabs.0/@sections.18" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.3/@elements.2">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleObjectLabelProviderConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="ObjectLabelProviderConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple ObjectLabelProviderConfiguration" sections="/0/@tabs.0/@sections.19" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.3/@elements.2">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleObjectLabelProviderConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="ObjectLabelProviderConfiguration"/>
-      </constraints>
-    </views>
-    <views name="Single FeatureLabelProviderConfiguration" sections="/0/@tabs.0/@sections.20" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.3/@elements.1">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleFeatureLabelProviderConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="FeatureLabelProviderConfiguration"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple FeatureLabelProviderConfiguration" sections="/0/@tabs.0/@sections.21" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.3/@elements.1">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleFeatureLabelProviderConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="FeatureLabelProviderConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
-      </constraints>
-    </views>
-    <views name="Single AbstractHeaderAxisConfiguration" sections="/0/@tabs.0/@sections.22" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.0">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleAbstractHeaderAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="AbstractHeaderAxisConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple AbstractHeaderAxisConfiguration" sections="/0/@tabs.0/@sections.23" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.0">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleAbstractHeaderAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="AbstractHeaderAxisConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-      </constraints>
-    </views>
-    <views name="Single AxisManagerRepresentation" sections="/0/@tabs.0/@sections.24" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.1">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleAxisManagerRepresentation">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="AxisManagerRepresentation"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple AxisManagerRepresentation" sections="/0/@tabs.0/@sections.25" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.1">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleAxisManagerRepresentation">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="AxisManagerRepresentation"/>
-      </constraints>
-    </views>
-    <views name="Single AxisManagerConfiguration" sections="/0/@tabs.0/@sections.26" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.2">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleAxisManagerConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="AxisManagerConfiguration"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple AxisManagerConfiguration" sections="/0/@tabs.0/@sections.27" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.2">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleAxisManagerConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="AxisManagerConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-      </constraints>
-    </views>
-    <views name="Single TableHeaderAxisConfiguration" sections="/0/@tabs.0/@sections.28" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.3">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleTableHeaderAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="TableHeaderAxisConfiguration"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple TableHeaderAxisConfiguration" sections="/0/@tabs.0/@sections.29" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.3">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleTableHeaderAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="TableHeaderAxisConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-      </constraints>
-    </views>
-    <views name="Single LocalTableHeaderAxisConfiguration" sections="/0/@tabs.0/@sections.30" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.4">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleLocalTableHeaderAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="LocalTableHeaderAxisConfiguration"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple LocalTableHeaderAxisConfiguration" sections="/0/@tabs.0/@sections.31" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.4">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleLocalTableHeaderAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="LocalTableHeaderAxisConfiguration"/>
-      </constraints>
-    </views>
-    <views name="Single IAxisConfiguration" sections="/0/@tabs.0/@sections.32" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.5">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleIAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="IAxisConfiguration"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple IAxisConfiguration" sections="/0/@tabs.0/@sections.33" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.5">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleIAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="IAxisConfiguration"/>
-      </constraints>
-    </views>
-    <views name="Single FeatureAxisConfiguration" sections="/0/@tabs.0/@sections.34" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.6">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleFeatureAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="FeatureAxisConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple FeatureAxisConfiguration" sections="/0/@tabs.0/@sections.35" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.6">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleFeatureAxisConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="FeatureAxisConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-      </constraints>
-    </views>
-    <views name="Single IFillingConfiguration" sections="/0/@tabs.0/@sections.36" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.7">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleIFillingConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="IFillingConfiguration"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple IFillingConfiguration" sections="/0/@tabs.0/@sections.37" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.7">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleIFillingConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="IFillingConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-      </constraints>
-    </views>
-    <views name="Single EStructuralFeatureValueFillingConfiguration" sections="/0/@tabs.0/@sections.38" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.8">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleEStructuralFeatureValueFillingConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="EStructuralFeatureValueFillingConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple EStructuralFeatureValueFillingConfiguration" sections="/0/@tabs.0/@sections.39" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.8">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleEStructuralFeatureValueFillingConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="EStructuralFeatureValueFillingConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-      </constraints>
-    </views>
-    <views name="Single IPasteConfiguration" sections="/0/@tabs.0/@sections.40" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.9">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleIPasteConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="IPasteConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple IPasteConfiguration" sections="/0/@tabs.0/@sections.41" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.9">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleIPasteConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="IPasteConfiguration"/>
-      </constraints>
-    </views>
-    <views name="Single PasteEObjectConfiguration" sections="/0/@tabs.0/@sections.42" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.10">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSinglePasteEObjectConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="PasteEObjectConfiguration"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple PasteEObjectConfiguration" sections="/0/@tabs.0/@sections.43" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.4/@elements.10">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultiplePasteEObjectConfiguration">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="PasteEObjectConfiguration"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
-      </constraints>
-    </views>
-    <views name="Single AbstractTableTester" sections="/0/@tabs.0/@sections.44" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.5/@elements.0">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleAbstractTableTester">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="AbstractTableTester"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple AbstractTableTester" sections="/0/@tabs.0/@sections.45" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.5/@elements.0">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleAbstractTableTester">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="AbstractTableTester"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"/>
-      </constraints>
-    </views>
-    <views name="Single JavaTableTester" sections="/0/@tabs.0/@sections.46" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.5/@elements.1">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleJavaTableTester">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="JavaTableTester"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple JavaTableTester" sections="/0/@tabs.0/@sections.47" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.5/@elements.1">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleJavaTableTester">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="JavaTableTester"/>
-      </constraints>
-    </views>
-    <views name="Single IAxis" sections="/0/@tabs.0/@sections.48" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.0">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleIAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="IAxis"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple IAxis" sections="/0/@tabs.0/@sections.49" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.0">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleIAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="IAxis"/>
-      </constraints>
-    </views>
-    <views name="Single IdAxis" sections="/0/@tabs.0/@sections.50" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.1">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleIdAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="IdAxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple IdAxis" sections="/0/@tabs.0/@sections.51" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.1">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleIdAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="IdAxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-      </constraints>
-    </views>
-    <views name="Single ObjectAxis" sections="/0/@tabs.0/@sections.52" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.4">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleObjectAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="ObjectAxis"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple ObjectAxis" sections="/0/@tabs.0/@sections.53" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.4">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleObjectAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="ObjectAxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-      </constraints>
-    </views>
-    <views name="Single EObjectAxis" sections="/0/@tabs.0/@sections.54" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.2">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleEObjectAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="EObjectAxis"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple EObjectAxis" sections="/0/@tabs.0/@sections.55" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.2">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleEObjectAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="EObjectAxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-      </constraints>
-    </views>
-    <views name="Single FeatureAxis" sections="/0/@tabs.0/@sections.56" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.3">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleFeatureAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="FeatureAxis"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple FeatureAxis" sections="/0/@tabs.0/@sections.57" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.3">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleFeatureAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="FeatureAxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-      </constraints>
-    </views>
-    <views name="Single FeatureIdAxis" sections="/0/@tabs.0/@sections.58" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.5">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleFeatureIdAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="FeatureIdAxis"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple FeatureIdAxis" sections="/0/@tabs.0/@sections.59" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.5">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleFeatureIdAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="FeatureIdAxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-      </constraints>
-    </views>
-    <views name="Single EStructuralFeatureAxis" sections="/0/@tabs.0/@sections.60" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.6">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleEStructuralFeatureAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="EStructuralFeatureAxis"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple EStructuralFeatureAxis" sections="/0/@tabs.0/@sections.61" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.6">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleEStructuralFeatureAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="EStructuralFeatureAxis"/>
-      </constraints>
-    </views>
-    <views name="Single ObjectIdAxis" sections="/0/@tabs.0/@sections.62" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.7">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isSingleObjectIdAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="ObjectIdAxis"/>
-      </constraints>
-    </views>
-    <views elementMultiplicity="-1" name="Multiple ObjectIdAxis" sections="/0/@tabs.0/@sections.63" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.6/@elements.7">
-      <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleObjectIdAxis">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="ObjectIdAxis"/>
-      </constraints>
-    </views>
-    <views name="SingleTableAppearance" sections="/0/@tabs.1/@sections.0">
-      <constraints xsi:type="constraints:SimpleConstraint" name="singleTable">
-        <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-        <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model"/>
-        <properties xsi:type="constraints:ValueProperty" name="className" value="Table"/>
-      </constraints>
-    </views>
-    <dataContexts name="nattable" label="nattable">
-      <elements name="Table" supertypes="/0/@dataContexts.0/@elements.1/@elements.0">
-        <properties name="context" type="Reference"/>
-        <properties name="tableConfiguration" type="Reference"/>
-        <properties name="invertAxis"/>
-        <properties name="columnAxisProvidersHistory" type="Reference" multiplicity="-1"/>
-        <properties name="rowAxisProvidersHistory" type="Reference" multiplicity="-1"/>
-        <properties name="localRowHeaderAxisConfiguration" type="Reference"/>
-        <properties name="localColumnHeaderAxisConfiguration" type="Reference"/>
-        <properties name="currentRowAxisProvider" type="Reference"/>
-        <properties name="currentColumnAxisProvider" type="Reference"/>
+    <views name="Single Table"
+        sections="/0/@tabs.0/@sections.0"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.0">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleTable">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="Table"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple Table"
+        sections="/0/@tabs.0/@sections.1"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.0">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleTable">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="Table"/>
+      </constraints>
+    </views>
+    <views name="Single TableConfiguration"
+        sections="/0/@tabs.0/@sections.2"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.1/@elements.1">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleTableConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="TableConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple TableConfiguration"
+        sections="/0/@tabs.0/@sections.3"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.1/@elements.1">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleTableConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="TableConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"/>
+      </constraints>
+    </views>
+    <views name="Single AbstractAxisProvider"
+        sections="/0/@tabs.0/@sections.4"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.2/@elements.0">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleAbstractAxisProvider">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="AbstractAxisProvider"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple AbstractAxisProvider"
+        sections="/0/@tabs.0/@sections.5"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.2/@elements.0">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleAbstractAxisProvider">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="AbstractAxisProvider"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
+      </constraints>
+    </views>
+    <views name="Single AxisProvider"
+        sections="/0/@tabs.0/@sections.6"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.2/@elements.3">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleAxisProvider">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="AxisProvider"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple AxisProvider"
+        sections="/0/@tabs.0/@sections.7"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.2/@elements.3">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleAxisProvider">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="AxisProvider"/>
+      </constraints>
+    </views>
+    <views name="Single IMasterAxisProvider"
+        sections="/0/@tabs.0/@sections.8"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.2/@elements.1">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleIMasterAxisProvider">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="IMasterAxisProvider"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple IMasterAxisProvider"
+        sections="/0/@tabs.0/@sections.9"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.2/@elements.1">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleIMasterAxisProvider">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="IMasterAxisProvider"/>
+      </constraints>
+    </views>
+    <views name="Single ISlaveAxisProvider"
+        sections="/0/@tabs.0/@sections.10"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.2/@elements.2">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleISlaveAxisProvider">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="ISlaveAxisProvider"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple ISlaveAxisProvider"
+        sections="/0/@tabs.0/@sections.11"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.2/@elements.2">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleISlaveAxisProvider">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="ISlaveAxisProvider"/>
+      </constraints>
+    </views>
+    <views name="Single SlaveObjectAxisProvider"
+        sections="/0/@tabs.0/@sections.12"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.2/@elements.4">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleSlaveObjectAxisProvider">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="SlaveObjectAxisProvider"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple SlaveObjectAxisProvider"
+        sections="/0/@tabs.0/@sections.13"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.2/@elements.4">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleSlaveObjectAxisProvider">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="SlaveObjectAxisProvider"/>
+      </constraints>
+    </views>
+    <views name="Single MasterObjectAxisProvider"
+        sections="/0/@tabs.0/@sections.14"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.2/@elements.5">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleMasterObjectAxisProvider">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="MasterObjectAxisProvider"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple MasterObjectAxisProvider"
+        sections="/0/@tabs.0/@sections.15"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.2/@elements.5">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleMasterObjectAxisProvider">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="MasterObjectAxisProvider"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"/>
+      </constraints>
+    </views>
+    <views name="Single ILabelProviderConfiguration"
+        sections="/0/@tabs.0/@sections.16"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.3/@elements.0">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleILabelProviderConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="ILabelProviderConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple ILabelProviderConfiguration"
+        sections="/0/@tabs.0/@sections.17"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.3/@elements.0">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleILabelProviderConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="ILabelProviderConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
+      </constraints>
+    </views>
+    <views name="Single ObjectLabelProviderConfiguration"
+        sections="/0/@tabs.0/@sections.18"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.3/@elements.2">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleObjectLabelProviderConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="ObjectLabelProviderConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple ObjectLabelProviderConfiguration"
+        sections="/0/@tabs.0/@sections.19"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.3/@elements.2">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleObjectLabelProviderConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="ObjectLabelProviderConfiguration"/>
+      </constraints>
+    </views>
+    <views name="Single FeatureLabelProviderConfiguration"
+        sections="/0/@tabs.0/@sections.20"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.3/@elements.1">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleFeatureLabelProviderConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="FeatureLabelProviderConfiguration"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple FeatureLabelProviderConfiguration"
+        sections="/0/@tabs.0/@sections.21"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.3/@elements.1">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleFeatureLabelProviderConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="FeatureLabelProviderConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"/>
+      </constraints>
+    </views>
+    <views name="Single AbstractHeaderAxisConfiguration"
+        sections="/0/@tabs.0/@sections.22"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.0">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleAbstractHeaderAxisConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="AbstractHeaderAxisConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple AbstractHeaderAxisConfiguration"
+        sections="/0/@tabs.0/@sections.23"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.0">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleAbstractHeaderAxisConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="AbstractHeaderAxisConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+      </constraints>
+    </views>
+    <views name="Single AxisManagerRepresentation"
+        sections="/0/@tabs.0/@sections.24"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.1">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleAxisManagerRepresentation">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="AxisManagerRepresentation"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple AxisManagerRepresentation"
+        sections="/0/@tabs.0/@sections.25"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.1">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleAxisManagerRepresentation">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="AxisManagerRepresentation"/>
+      </constraints>
+    </views>
+    <views name="Single AxisManagerConfiguration"
+        sections="/0/@tabs.0/@sections.26"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.2">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleAxisManagerConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="AxisManagerConfiguration"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple AxisManagerConfiguration"
+        sections="/0/@tabs.0/@sections.27"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.2">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleAxisManagerConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="AxisManagerConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+      </constraints>
+    </views>
+    <views name="Single TableHeaderAxisConfiguration"
+        sections="/0/@tabs.0/@sections.28"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.3">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleTableHeaderAxisConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="TableHeaderAxisConfiguration"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple TableHeaderAxisConfiguration"
+        sections="/0/@tabs.0/@sections.29"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.3">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleTableHeaderAxisConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="TableHeaderAxisConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+      </constraints>
+    </views>
+    <views name="Single LocalTableHeaderAxisConfiguration"
+        sections="/0/@tabs.0/@sections.30"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.4">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleLocalTableHeaderAxisConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="LocalTableHeaderAxisConfiguration"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple LocalTableHeaderAxisConfiguration"
+        sections="/0/@tabs.0/@sections.31"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.4">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleLocalTableHeaderAxisConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="LocalTableHeaderAxisConfiguration"/>
+      </constraints>
+    </views>
+    <views name="Single IAxisConfiguration"
+        sections="/0/@tabs.0/@sections.32"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.5">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleIAxisConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="IAxisConfiguration"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple IAxisConfiguration"
+        sections="/0/@tabs.0/@sections.33"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.5">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleIAxisConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="IAxisConfiguration"/>
+      </constraints>
+    </views>
+    <views name="Single FeatureAxisConfiguration"
+        sections="/0/@tabs.0/@sections.34"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.6">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleFeatureAxisConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="FeatureAxisConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple FeatureAxisConfiguration"
+        sections="/0/@tabs.0/@sections.35"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.6">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleFeatureAxisConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="FeatureAxisConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+      </constraints>
+    </views>
+    <views name="Single IFillingConfiguration"
+        sections="/0/@tabs.0/@sections.36"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.7">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleIFillingConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="IFillingConfiguration"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple IFillingConfiguration"
+        sections="/0/@tabs.0/@sections.37"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.7">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleIFillingConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="IFillingConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+      </constraints>
+    </views>
+    <views name="Single EStructuralFeatureValueFillingConfiguration"
+        sections="/0/@tabs.0/@sections.38"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.8">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleEStructuralFeatureValueFillingConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="EStructuralFeatureValueFillingConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple EStructuralFeatureValueFillingConfiguration"
+        sections="/0/@tabs.0/@sections.39"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.8">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleEStructuralFeatureValueFillingConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="EStructuralFeatureValueFillingConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+      </constraints>
+    </views>
+    <views name="Single IPasteConfiguration"
+        sections="/0/@tabs.0/@sections.40"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.9">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleIPasteConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="IPasteConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple IPasteConfiguration"
+        sections="/0/@tabs.0/@sections.41"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.9">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleIPasteConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="IPasteConfiguration"/>
+      </constraints>
+    </views>
+    <views name="Single PasteEObjectConfiguration"
+        sections="/0/@tabs.0/@sections.42"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.10">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSinglePasteEObjectConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="PasteEObjectConfiguration"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple PasteEObjectConfiguration"
+        sections="/0/@tabs.0/@sections.43"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.4/@elements.10">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultiplePasteEObjectConfiguration">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="PasteEObjectConfiguration"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"/>
+      </constraints>
+    </views>
+    <views name="Single AbstractTableTester"
+        sections="/0/@tabs.0/@sections.44"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.5/@elements.0">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleAbstractTableTester">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="AbstractTableTester"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple AbstractTableTester"
+        sections="/0/@tabs.0/@sections.45"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.5/@elements.0">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleAbstractTableTester">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="AbstractTableTester"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"/>
+      </constraints>
+    </views>
+    <views name="Single JavaTableTester"
+        sections="/0/@tabs.0/@sections.46"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.5/@elements.1">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleJavaTableTester">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="JavaTableTester"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple JavaTableTester"
+        sections="/0/@tabs.0/@sections.47"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.5/@elements.1">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleJavaTableTester">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="JavaTableTester"/>
+      </constraints>
+    </views>
+    <views name="Single IAxis"
+        sections="/0/@tabs.0/@sections.48"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.0">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleIAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="IAxis"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple IAxis"
+        sections="/0/@tabs.0/@sections.49"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.0">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleIAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="IAxis"/>
+      </constraints>
+    </views>
+    <views name="Single IdAxis"
+        sections="/0/@tabs.0/@sections.50"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.1">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleIdAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="IdAxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple IdAxis"
+        sections="/0/@tabs.0/@sections.51"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.1">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleIdAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="IdAxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+      </constraints>
+    </views>
+    <views name="Single ObjectAxis"
+        sections="/0/@tabs.0/@sections.52"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.4">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleObjectAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="ObjectAxis"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple ObjectAxis"
+        sections="/0/@tabs.0/@sections.53"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.4">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleObjectAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="ObjectAxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+      </constraints>
+    </views>
+    <views name="Single EObjectAxis"
+        sections="/0/@tabs.0/@sections.54"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.2">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleEObjectAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="EObjectAxis"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple EObjectAxis"
+        sections="/0/@tabs.0/@sections.55"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.2">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleEObjectAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="EObjectAxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+      </constraints>
+    </views>
+    <views name="Single FeatureAxis"
+        sections="/0/@tabs.0/@sections.56"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.3">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleFeatureAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="FeatureAxis"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple FeatureAxis"
+        sections="/0/@tabs.0/@sections.57"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.3">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleFeatureAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="FeatureAxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+      </constraints>
+    </views>
+    <views name="Single FeatureIdAxis"
+        sections="/0/@tabs.0/@sections.58"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.5">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleFeatureIdAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="FeatureIdAxis"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple FeatureIdAxis"
+        sections="/0/@tabs.0/@sections.59"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.5">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleFeatureIdAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="FeatureIdAxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+      </constraints>
+    </views>
+    <views name="Single EStructuralFeatureAxis"
+        sections="/0/@tabs.0/@sections.60"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.6">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleEStructuralFeatureAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="EStructuralFeatureAxis"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple EStructuralFeatureAxis"
+        sections="/0/@tabs.0/@sections.61"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.6">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleEStructuralFeatureAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="EStructuralFeatureAxis"/>
+      </constraints>
+    </views>
+    <views name="Single ObjectIdAxis"
+        sections="/0/@tabs.0/@sections.62"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.7">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isSingleObjectIdAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="ObjectIdAxis"/>
+      </constraints>
+    </views>
+    <views elementMultiplicity="-1"
+        name="Multiple ObjectIdAxis"
+        sections="/0/@tabs.0/@sections.63"
+        automaticContext="true"
+        datacontexts="/0/@dataContexts.0/@elements.6/@elements.7">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="isMultipleObjectIdAxis">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="ObjectIdAxis"/>
+      </constraints>
+    </views>
+    <views name="SingleTableAppearance"
+        sections="/0/@tabs.1/@sections.0 /0/@tabs.1/@sections.1 /0/@tabs.1/@sections.2">
+      <constraints
+          xsi:type="constraints:SimpleConstraint"
+          name="singleTable">
+        <constraintType
+            href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="nsUri"
+            value="http://www.eclipse.org/papyrus/nattable/model"/>
+        <properties
+            xsi:type="constraints:ValueProperty"
+            name="className"
+            value="Table"/>
+      </constraints>
+    </views>
+    <dataContexts
+        name="nattable"
+        label="nattable">
+      <elements
+          name="Table"
+          supertypes="/0/@dataContexts.0/@elements.1/@elements.0">
+        <properties
+            name="context"
+            type="Reference"/>
+        <properties
+            name="tableConfiguration"
+            type="Reference"/>
+        <properties
+            name="invertAxis"/>
+        <properties
+            name="columnAxisProvidersHistory"
+            type="Reference"
+            multiplicity="-1"/>
+        <properties
+            name="rowAxisProvidersHistory"
+            type="Reference"
+            multiplicity="-1"/>
+        <properties
+            name="localRowHeaderAxisConfiguration"
+            type="Reference"/>
+        <properties
+            name="localColumnHeaderAxisConfiguration"
+            type="Reference"/>
+        <properties
+            name="currentRowAxisProvider"
+            type="Reference"/>
+        <properties
+            name="currentColumnAxisProvider"
+            type="Reference"/>
+        <properties
+            name="columnFeatureLabelProviderConfigurationDisplayIcon"
+            label="Display Column FeatureIcon"
+            type="Boolean"
+            description="Display Column Icon"/>
+        <properties
+            name="columnFeatureLabelProviderConfigurationDisplayLabel"
+            label="Display Column Feature Label"
+            type="Boolean"
+            description="Display Column Label"/>
+        <properties
+            name="columnFeatureLabelProviderConfigurationDisplayIsDerived"
+            label="Display Column Feature IsDerived"
+            type="Boolean"
+            description="Display Column Feature IsDerived"/>
+        <properties
+            name="columnFeatureLabelProviderConfigurationDisplayType"
+            label="Display Column Feature Type"
+            type="Boolean"
+            description="Display Column Feature Type"/>
+        <properties
+            name="columnFeatureLabelProviderConfigurationDisplayMultiplicity"
+            label="Display Column Feature Multiplicity"
+            type="Boolean"
+            description="Display Column Feature Multiplicity"/>
+        <properties
+            name="columnFeatureLabelProviderConfigurationDisplayName"
+            label="Display Column Feature Name"
+            type="Boolean"
+            description="Display Column Feature Name"/>
+        <properties
+            name="columnObjectLabelProviderConfigurationDisplayIcon"
+            label="Display Column Object Icon"
+            type="Boolean"
+            description="Display Column Object Icon"/>
+        <properties
+            name="columnObjectLabelProviderConfigurationDisplayLabel"
+            label="Display Column Object Label"
+            type="Boolean"
+            description="Display Column Object Label"/>
       </elements>
-      <elements xsi:type="contexts:DataContextPackage" name="nattableconfiguration">
-        <elements name="TableNamedElement">
-          <properties name="description"/>
-          <properties name="name"/>
+      <elements
+          xsi:type="contexts:DataContextPackage"
+          name="nattableconfiguration">
+        <elements
+            name="TableNamedElement">
+          <properties
+              name="description"/>
+          <properties
+              name="name"/>
         </elements>
-        <elements name="TableConfiguration" supertypes="/0/@dataContexts.0/@elements.1/@elements.0">
-          <properties name="type"/>
-          <properties name="iconPath"/>
-          <properties name="creationTester" type="Reference"/>
-          <properties name="cellEditorDeclaration" type="Enumeration"/>
-          <properties name="rowHeaderAxisConfiguration" type="Reference"/>
-          <properties name="columnHeaderAxisConfiguration" type="Reference"/>
-          <properties name="columnAxisProviders" type="Reference" multiplicity="-1"/>
-          <properties name="rowAxisProviders" type="Reference" multiplicity="-1"/>
-          <properties name="defaultRowAxisProvider" type="Reference"/>
-          <properties name="defaultColumnAxisProvider" type="Reference"/>
+        <elements
+            name="TableConfiguration"
+            supertypes="/0/@dataContexts.0/@elements.1/@elements.0">
+          <properties
+              name="type"/>
+          <properties
+              name="iconPath"/>
+          <properties
+              name="creationTester"
+              type="Reference"/>
+          <properties
+              name="cellEditorDeclaration"
+              type="Enumeration"/>
+          <properties
+              name="rowHeaderAxisConfiguration"
+              type="Reference"/>
+          <properties
+              name="columnHeaderAxisConfiguration"
+              type="Reference"/>
+          <properties
+              name="columnAxisProviders"
+              type="Reference"
+              multiplicity="-1"/>
+          <properties
+              name="rowAxisProviders"
+              type="Reference"
+              multiplicity="-1"/>
+          <properties
+              name="defaultRowAxisProvider"
+              type="Reference"/>
+          <properties
+              name="defaultColumnAxisProvider"
+              type="Reference"/>
         </elements>
       </elements>
-      <elements xsi:type="contexts:DataContextPackage" name="nattableaxisprovider">
-        <elements name="AbstractAxisProvider"/>
-        <elements name="IMasterAxisProvider" supertypes="/0/@dataContexts.0/@elements.2/@elements.3">
-          <properties name="disconnectSlave"/>
+      <elements
+          xsi:type="contexts:DataContextPackage"
+          name="nattableaxisprovider">
+        <elements
+            name="AbstractAxisProvider"/>
+        <elements
+            name="IMasterAxisProvider"
+            supertypes="/0/@dataContexts.0/@elements.2/@elements.3">
+          <properties
+              name="disconnectSlave"/>
         </elements>
-        <elements name="ISlaveAxisProvider" supertypes="/0/@dataContexts.0/@elements.2/@elements.3"/>
-        <elements name="AxisProvider" supertypes="/0/@dataContexts.0/@elements.2/@elements.0">
-          <properties name="axis" type="Reference" multiplicity="-1"/>
+        <elements
+            name="ISlaveAxisProvider"
+            supertypes="/0/@dataContexts.0/@elements.2/@elements.3"/>
+        <elements
+            name="AxisProvider"
+            supertypes="/0/@dataContexts.0/@elements.2/@elements.0">
+          <properties
+              name="axis"
+              type="Reference"
+              multiplicity="-1"/>
         </elements>
-        <elements name="SlaveObjectAxisProvider" supertypes="/0/@dataContexts.0/@elements.2/@elements.2"/>
-        <elements name="MasterObjectAxisProvider" supertypes="/0/@dataContexts.0/@elements.2/@elements.1"/>
+        <elements
+            name="SlaveObjectAxisProvider"
+            supertypes="/0/@dataContexts.0/@elements.2/@elements.2"/>
+        <elements
+            name="MasterObjectAxisProvider"
+            supertypes="/0/@dataContexts.0/@elements.2/@elements.1"/>
       </elements>
-      <elements xsi:type="contexts:DataContextPackage" name="nattablelabelprovider">
-        <elements name="ILabelProviderConfiguration"/>
-        <elements name="FeatureLabelProviderConfiguration" supertypes="/0/@dataContexts.0/@elements.3/@elements.2">
-          <properties name="displayIsDerived"/>
-          <properties name="displayType"/>
-          <properties name="displayMultiplicity"/>
-          <properties name="displayName"/>
+      <elements
+          xsi:type="contexts:DataContextPackage"
+          name="nattablelabelprovider">
+        <elements
+            name="ILabelProviderConfiguration"/>
+        <elements
+            name="FeatureLabelProviderConfiguration"
+            supertypes="/0/@dataContexts.0/@elements.3/@elements.2">
+          <properties
+              name="displayIsDerived"/>
+          <properties
+              name="displayType"/>
+          <properties
+              name="displayMultiplicity"/>
+          <properties
+              name="displayName"/>
         </elements>
-        <elements name="ObjectLabelProviderConfiguration" supertypes="/0/@dataContexts.0/@elements.3/@elements.0">
-          <properties name="displayIcon"/>
-          <properties name="displayLabel"/>
+        <elements
+            name="ObjectLabelProviderConfiguration"
+            supertypes="/0/@dataContexts.0/@elements.3/@elements.0">
+          <properties
+              name="displayIcon"/>
+          <properties
+              name="displayLabel"/>
         </elements>
       </elements>
-      <elements xsi:type="contexts:DataContextPackage" name="nattableaxisconfiguration">
-        <elements name="AbstractHeaderAxisConfiguration">
-          <properties name="indexStyle" type="Enumeration"/>
-          <properties name="displayLabel"/>
-          <properties name="displayFilter"/>
-          <properties name="displayIndex"/>
-          <properties name="ownedLabelConfigurations" type="Reference" multiplicity="-1"/>
-          <properties name="ownedAxisConfigurations" type="Reference" multiplicity="-1"/>
+      <elements
+          xsi:type="contexts:DataContextPackage"
+          name="nattableaxisconfiguration">
+        <elements
+            name="AbstractHeaderAxisConfiguration">
+          <properties
+              name="indexStyle"
+              type="Enumeration"/>
+          <properties
+              name="displayLabel"/>
+          <properties
+              name="displayFilter"/>
+          <properties
+              name="displayIndex"/>
+          <properties
+              name="ownedLabelConfigurations"
+              type="Reference"
+              multiplicity="-1"/>
+          <properties
+              name="ownedAxisConfigurations"
+              type="Reference"
+              multiplicity="-1"/>
         </elements>
-        <elements name="AxisManagerRepresentation">
-          <properties name="axisManagerId"/>
-          <properties name="labelProviderContext"/>
-          <properties name="headerLabelConfiguration" type="Reference"/>
-          <properties name="specificAxisConfigurations" type="Reference" multiplicity="-1"/>
+        <elements
+            name="AxisManagerRepresentation">
+          <properties
+              name="axisManagerId"/>
+          <properties
+              name="labelProviderContext"/>
+          <properties
+              name="headerLabelConfiguration"
+              type="Reference"/>
+          <properties
+              name="specificAxisConfigurations"
+              type="Reference"
+              multiplicity="-1"/>
         </elements>
-        <elements name="AxisManagerConfiguration">
-          <properties name="localHeaderLabelConfiguration" type="Reference"/>
-          <properties name="axisManager" type="Reference"/>
-          <properties name="localSpecificConfigurations" type="Reference" multiplicity="-1"/>
+        <elements
+            name="AxisManagerConfiguration">
+          <properties
+              name="localHeaderLabelConfiguration"
+              type="Reference"/>
+          <properties
+              name="axisManager"
+              type="Reference"/>
+          <properties
+              name="localSpecificConfigurations"
+              type="Reference"
+              multiplicity="-1"/>
         </elements>
-        <elements name="TableHeaderAxisConfiguration" supertypes="/0/@dataContexts.0/@elements.4/@elements.0">
-          <properties name="axisManagers" type="Reference" multiplicity="-1"/>
+        <elements
+            name="TableHeaderAxisConfiguration"
+            supertypes="/0/@dataContexts.0/@elements.4/@elements.0">
+          <properties
+              name="axisManagers"
+              type="Reference"
+              multiplicity="-1"/>
         </elements>
-        <elements name="LocalTableHeaderAxisConfiguration" supertypes="/0/@dataContexts.0/@elements.4/@elements.0">
-          <properties name="axisManagerConfigurations" type="Reference" multiplicity="-1"/>
+        <elements
+            name="LocalTableHeaderAxisConfiguration"
+            supertypes="/0/@dataContexts.0/@elements.4/@elements.0">
+          <properties
+              name="axisManagerConfigurations"
+              type="Reference"
+              multiplicity="-1"/>
         </elements>
-        <elements name="IAxisConfiguration"/>
-        <elements name="FeatureAxisConfiguration" supertypes="/0/@dataContexts.0/@elements.4/@elements.5">
-          <properties name="showOnlyCommonFeature" type="Boolean"/>
+        <elements
+            name="IAxisConfiguration"/>
+        <elements
+            name="FeatureAxisConfiguration"
+            supertypes="/0/@dataContexts.0/@elements.4/@elements.5">
+          <properties
+              name="showOnlyCommonFeature"
+              type="Boolean"/>
         </elements>
-        <elements name="IFillingConfiguration" supertypes="/0/@dataContexts.0/@elements.4/@elements.5"/>
-        <elements name="EStructuralFeatureValueFillingConfiguration" supertypes="/0/@dataContexts.0/@elements.4/@elements.7">
-          <properties name="listenFeature" type="Reference"/>
+        <elements
+            name="IFillingConfiguration"
+            supertypes="/0/@dataContexts.0/@elements.4/@elements.5"/>
+        <elements
+            name="EStructuralFeatureValueFillingConfiguration"
+            supertypes="/0/@dataContexts.0/@elements.4/@elements.7">
+          <properties
+              name="listenFeature"
+              type="Reference"/>
         </elements>
-        <elements name="IPasteConfiguration" supertypes="/0/@dataContexts.0/@elements.4/@elements.5"/>
-        <elements name="PasteEObjectConfiguration" supertypes="/0/@dataContexts.0/@elements.4/@elements.9">
-          <properties name="pastedElementId"/>
-          <properties name="pasteElementContainementFeature" type="Reference"/>
+        <elements
+            name="IPasteConfiguration"
+            supertypes="/0/@dataContexts.0/@elements.4/@elements.5"/>
+        <elements
+            name="PasteEObjectConfiguration"
+            supertypes="/0/@dataContexts.0/@elements.4/@elements.9">
+          <properties
+              name="pastedElementId"/>
+          <properties
+              name="pasteElementContainementFeature"
+              type="Reference"/>
         </elements>
       </elements>
-      <elements xsi:type="contexts:DataContextPackage" name="nattabletester">
-        <elements name="AbstractTableTester"/>
-        <elements name="JavaTableTester" supertypes="/0/@dataContexts.0/@elements.5/@elements.0">
-          <properties name="tester"/>
+      <elements
+          xsi:type="contexts:DataContextPackage"
+          name="nattabletester">
+        <elements
+            name="AbstractTableTester"/>
+        <elements
+            name="JavaTableTester"
+            supertypes="/0/@dataContexts.0/@elements.5/@elements.0">
+          <properties
+              name="tester"/>
         </elements>
       </elements>
-      <elements xsi:type="contexts:DataContextPackage" name="nattableaxis">
-        <elements name="IAxis">
-          <properties name="manager" type="Reference"/>
-          <properties name="alias"/>
+      <elements
+          xsi:type="contexts:DataContextPackage"
+          name="nattableaxis">
+        <elements
+            name="IAxis">
+          <properties
+              name="manager"
+              type="Reference"/>
+          <properties
+              name="alias"/>
         </elements>
-        <elements name="IdAxis" supertypes="/0/@dataContexts.0/@elements.6/@elements.0">
-          <properties name="element"/>
+        <elements
+            name="IdAxis"
+            supertypes="/0/@dataContexts.0/@elements.6/@elements.0">
+          <properties
+              name="element"/>
         </elements>
-        <elements name="EObjectAxis" supertypes="/0/@dataContexts.0/@elements.6/@elements.4">
-          <properties name="element" type="Reference"/>
+        <elements
+            name="EObjectAxis"
+            supertypes="/0/@dataContexts.0/@elements.6/@elements.4">
+          <properties
+              name="element"
+              type="Reference"/>
         </elements>
-        <elements name="FeatureAxis" supertypes="/0/@dataContexts.0/@elements.6/@elements.0">
-          <properties name="localLabelConfiguration" type="Reference"/>
+        <elements
+            name="FeatureAxis"
+            supertypes="/0/@dataContexts.0/@elements.6/@elements.0">
+          <properties
+              name="localLabelConfiguration"
+              type="Reference"/>
         </elements>
-        <elements name="ObjectAxis" supertypes="/0/@dataContexts.0/@elements.6/@elements.0">
-          <properties name="localLabelConfiguration" type="Reference"/>
+        <elements
+            name="ObjectAxis"
+            supertypes="/0/@dataContexts.0/@elements.6/@elements.0">
+          <properties
+              name="localLabelConfiguration"
+              type="Reference"/>
         </elements>
-        <elements name="FeatureIdAxis" supertypes="/0/@dataContexts.0/@elements.6/@elements.1 /0/@dataContexts.0/@elements.6/@elements.3"/>
-        <elements name="EStructuralFeatureAxis" supertypes="/0/@dataContexts.0/@elements.6/@elements.3">
-          <properties name="element" type="Reference"/>
+        <elements
+            name="FeatureIdAxis"
+            supertypes="/0/@dataContexts.0/@elements.6/@elements.1 /0/@dataContexts.0/@elements.6/@elements.3"/>
+        <elements
+            name="EStructuralFeatureAxis"
+            supertypes="/0/@dataContexts.0/@elements.6/@elements.3">
+          <properties
+              name="element"
+              type="Reference"/>
         </elements>
-        <elements name="ObjectIdAxis" supertypes="/0/@dataContexts.0/@elements.6/@elements.1 /0/@dataContexts.0/@elements.6/@elements.4"/>
+        <elements
+            name="ObjectIdAxis"
+            supertypes="/0/@dataContexts.0/@elements.6/@elements.1 /0/@dataContexts.0/@elements.6/@elements.4"/>
       </elements>
-      <modelElementFactory href="Environment.xmi#//@modelElementFactories.0"/>
+      <modelElementFactory
+          href="Environment.xmi#//@modelElementFactories.0"/>
     </dataContexts>
   </contexts:Context>
-  <contexts:View name="Single TableNamedElement" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.1/@elements.0">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleTableNamedElement">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" name="className" value="TableNamedElement"/>
-      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"/>
+  <contexts:View
+      name="Single TableNamedElement"
+      automaticContext="true"
+      datacontexts="/0/@dataContexts.0/@elements.1/@elements.0">
+    <constraints
+        xsi:type="constraints:SimpleConstraint"
+        name="isSingleTableNamedElement">
+      <constraintType
+          href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties
+          xsi:type="constraints:ValueProperty"
+          name="className"
+          value="TableNamedElement"/>
+      <properties
+          xsi:type="constraints:ValueProperty"
+          name="nsUri"
+          value="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"/>
     </constraints>
   </contexts:View>
-  <contexts:View elementMultiplicity="-1" name="Multiple TableNamedElement" automaticContext="true" datacontexts="/0/@dataContexts.0/@elements.1/@elements.0">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleTableNamedElement">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" name="className" value="TableNamedElement"/>
+  <contexts:View
+      elementMultiplicity="-1"
+      name="Multiple TableNamedElement"
+      automaticContext="true"
+      datacontexts="/0/@dataContexts.0/@elements.1/@elements.0">
+    <constraints
+        xsi:type="constraints:SimpleConstraint"
+        name="isMultipleTableNamedElement">
+      <constraintType
+          href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties
+          xsi:type="constraints:ValueProperty"
+          name="nsUri"
+          value="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"/>
+      <properties
+          xsi:type="constraints:ValueProperty"
+          name="className"
+          value="TableNamedElement"/>
     </constraints>
   </contexts:View>
 </xmi:XMI>
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/ui/ColumnFeatureLabelProviderConfiguration.xwt b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/ui/ColumnFeatureLabelProviderConfiguration.xwt
new file mode 100644
index 00000000000..327811fa3d8
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/ui/ColumnFeatureLabelProviderConfiguration.xwt
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+	text="Column Header Label Style">
+	<Group.layout>
+		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<Composite xmlns:x="http://www.eclipse.org/xwt" text="Column Header Label Style"
+			xmlns="http://www.eclipse.org/xwt/presentation"
+			xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+			xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
+			<Composite.layout>
+				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+			</Composite.layout>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayIcon"
+				customLabel="Display Icon"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayLabel"
+				customLabel="Display Label"></ppe:BooleanRadio>
+		</Composite>
+		<Group text="Label Feature Style">
+			<Group.layout>
+				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+			</Group.layout>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayIsDerived"
+				customLabel="Display IsDerived"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayType"
+				customLabel="Display Type"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayName"
+				customLabel="Display Name"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnFeatureLabelProviderConfigurationDisplayMultiplicity"
+				customLabel="Display Multiplicity"></ppe:BooleanRadio>
+		</Group>
+	</Composite>
+</Group>
+\ No newline at end of file
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/ui/ColumnObjectLabelProviderConfiguration.xwt b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/ui/ColumnObjectLabelProviderConfiguration.xwt
new file mode 100644
index 00000000000..272172d5b94
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/ui/ColumnObjectLabelProviderConfiguration.xwt
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	text="Column Header Label Style">
+	<Group.layout>
+		<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<Composite>
+			<Composite.layout>
+				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+			</Composite.layout>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnObjectLabelProviderConfigurationDisplayIcon"
+				customLabel="Display Icon"></ppe:BooleanRadio>
+			<ppe:BooleanRadio input="{Binding}"
+				property="nattable:Table:columnObjectLabelProviderConfigurationDisplayLabel"
+				customLabel="Display Label"></ppe:BooleanRadio>
+		</Composite>
+		<Composite>
+			<Composite.layout>
+				<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+			</Composite.layout>
+		</Composite>
+	</Composite>
+</Group>
+\ No newline at end of file
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTable.xwt b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTable.xwt
index 688a4a927d4..59f4909fe18 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTable.xwt
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTable.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
-	xmlns="http://www.eclipse.org/xwt/presentation">
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+	xmlns:j="clr-namespace:java.lang">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableAppearance.xwt b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableAppearance.xwt
index e1efc4408f2..ce595be6ee3 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableAppearance.xwt
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/model/ui/SingleTableAppearance.xwt
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
-	xmlns:x="http://www.eclipse.org/xwt"
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" text="Column">
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+	text="Column">
 	<Composite.layout>
-		<ppel:PropertiesLayout makeColumnsEqualWidth="true"
-			numColumns="1"></ppel:PropertiesLayout>
+		<ppel:PropertiesLayout numColumns="1"
+			makeColumnsEqualWidth="true"></ppel:PropertiesLayout>
 	</Composite.layout>
 	<Group text="Table">
 		<Group.layout>
 			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
 		</Group.layout>
-		<ppe:BooleanRadio property="nattable:Table:invertAxis"
-			input="{Binding}"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}" property="nattable:Table:invertAxis"></ppe:BooleanRadio>
 	</Group>
 	<Group text="Column">
 		<Group.layout>
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnFeatureLabelConfigurationConstraint.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnFeatureLabelConfigurationConstraint.java
new file mode 100644
index 00000000000..b12cd941bd2
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnFeatureLabelConfigurationConstraint.java
@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * 
+ * Constraint to know if the table has a feature column label configuration
+ * 
+ */
+public class HasColumnFeatureLabelConfigurationConstraint implements JavaQuery {
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 * 
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		final EObject table = EMFHelper.getEObject(selection);
+		return LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration((Table)table) != null;
+	}
+
+}
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnObjectLabelConfigurationConstraint.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnObjectLabelConfigurationConstraint.java
new file mode 100644
index 00000000000..7874fa78d94
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/constraints/HasColumnObjectLabelConfigurationConstraint.java
@@ -0,0 +1,47 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.constraints;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+
+/**
+ * Constraint to know if the table has an object column label configuration
+ * 
+ * @author vl222926
+ * 
+ */
+public class HasColumnObjectLabelConfigurationConstraint implements JavaQuery {
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)
+	 * 
+	 * @param selection
+	 * @return
+	 */
+	@Override
+	public boolean match(Object selection) {
+		final EObject table = EMFHelper.getEObject(selection);
+		final ObjectLabelProviderConfiguration objectConf = LabelConfigurationManagementUtils.getUsedColumnObjectLabelConfiguration((Table)table);
+		final FeatureLabelProviderConfiguration featureConf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration((Table)table);
+		return objectConf != null && featureConf == null;
+	}
+
+}
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java
index 66003365611..314134ada13 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/modelelement/NatTableModelElement.java
@@ -25,26 +25,36 @@ import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
-import org.eclipse.papyrus.infra.nattable.properties.observable.AbstractAxisHeaderConfigurationElementObservableValue;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+import org.eclipse.papyrus.infra.nattable.properties.observable.AbstractConfigurationElementObservableValue;
 import org.eclipse.papyrus.infra.nattable.properties.observable.ColumnDisplayFilterHeaderObservableValue;
 import org.eclipse.papyrus.infra.nattable.properties.observable.ColumnDisplayIndexHeaderObservableValue;
 import org.eclipse.papyrus.infra.nattable.properties.observable.ColumnDisplayLabelHeaderObservableValue;
+import org.eclipse.papyrus.infra.nattable.properties.observable.ColumnFeatureLabelDisplayIconObservableValue;
+import org.eclipse.papyrus.infra.nattable.properties.observable.ColumnFeatureLabelDisplayIsDerivedObservableValue;
+import org.eclipse.papyrus.infra.nattable.properties.observable.ColumnFeatureLabelDisplayLabelObservableValue;
+import org.eclipse.papyrus.infra.nattable.properties.observable.ColumnFeatureLabelDisplayMultiplicityObservableValue;
+import org.eclipse.papyrus.infra.nattable.properties.observable.ColumnFeatureLabelDisplayNameObservableValue;
+import org.eclipse.papyrus.infra.nattable.properties.observable.ColumnFeatureLabelDisplayTypeObservableValue;
 import org.eclipse.papyrus.infra.nattable.properties.observable.ColumnIndexHeaderStyleObservableValue;
+import org.eclipse.papyrus.infra.nattable.properties.observable.ColumnObjectLabelDisplayIconObservableValue;
+import org.eclipse.papyrus.infra.nattable.properties.observable.ColumnObjectLabelDisplayLabelObservableValue;
 import org.eclipse.papyrus.infra.nattable.properties.observable.RowDisplayIndexHeaderObservableValue;
 import org.eclipse.papyrus.infra.nattable.properties.observable.RowDisplayLabelHeaderObservableValue;
 import org.eclipse.papyrus.infra.nattable.properties.observable.RowIndexHeaderStyleObservableValue;
 import org.eclipse.papyrus.infra.nattable.properties.utils.Constants;
 import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;
 import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
 
 
 public class NatTableModelElement extends EMFModelElement {
@@ -57,7 +67,7 @@ public class NatTableModelElement extends EMFModelElement {
 	/**
 	 * the map linking the propertypath and the observable values
 	 */
-	private Map<String, AbstractAxisHeaderConfigurationElementObservableValue> observableValues;
+	private Map<String, AbstractConfigurationElementObservableValue> observableValues;
 
 	/**
 	 * the collection of the interesting features to update the property view
@@ -75,6 +85,11 @@ public class NatTableModelElement extends EMFModelElement {
 	private AbstractHeaderAxisConfiguration columnHeaderAxisConfiguration;
 
 	/**
+	 * the list of the column label provider configuration
+	 */
+	private Collection<ILabelProviderConfiguration> columnLabelProviderConfigurations;
+
+	/**
 	 * 
 	 * Constructor.
 	 * 
@@ -92,7 +107,7 @@ public class NatTableModelElement extends EMFModelElement {
 	 * Add the listener
 	 */
 	private void init() {
-		this.observableValues = new HashMap<String, AbstractAxisHeaderConfigurationElementObservableValue>();
+		this.observableValues = new HashMap<String, AbstractConfigurationElementObservableValue>();
 		this.interestingFeatures = new ArrayList<EStructuralFeature>();
 		interestingFeatures.add(NattablePackage.eINSTANCE.getTable_InvertAxis());
 		interestingFeatures.add(NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration());
@@ -101,6 +116,12 @@ public class NatTableModelElement extends EMFModelElement {
 		interestingFeatures.add(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayIndex());
 		interestingFeatures.add(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_DisplayLabel());
 		interestingFeatures.add(NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_IndexStyle());
+		interestingFeatures.add(NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived());
+		interestingFeatures.add(NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity());
+		interestingFeatures.add(NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName());
+		interestingFeatures.add(NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType());
+		interestingFeatures.add(NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());
+		interestingFeatures.add(NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());
 
 		this.tableListener = new AdapterImpl() {
 
@@ -117,23 +138,76 @@ public class NatTableModelElement extends EMFModelElement {
 				}
 			}
 		};
+		//we add a listener on the main object managed by the property view
+		source.eAdapters().add(tableListener);
+		initOtherFieldsAndAddOthersListeners();
+
+	}
+
+	/**
+	 * init the fields of the elements to listen (excepted the table itself)+ add listeners on them
+	 */
+	private void initOtherFieldsAndAddOthersListeners() {
+
 		columnHeaderAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTable(getEditedTable());
 		rowHeaderAxisConfiguration = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTable(getEditedTable());
+
+		//COLUMNS MANAGEMENT
+		//we add a listener on the columnHeaderAxisConfiguration
 		if(columnHeaderAxisConfiguration != null) {
 			columnHeaderAxisConfiguration.eAdapters().add(tableListener);
 		}
+
+		if(columnHeaderAxisConfiguration != null) {
+			columnLabelProviderConfigurations = columnHeaderAxisConfiguration.getOwnedLabelConfigurations();
+		}
+
+		if(this.columnLabelProviderConfigurations != null) {
+			//we add listener on all column label configurations
+			for(final ILabelProviderConfiguration conf : columnLabelProviderConfigurations) {
+				conf.eAdapters().add(tableListener);
+			}
+		}
+
+		//ROW MANAGEMENT
+		//we add a listener on the rowHeaderAxisConfiguration
 		if(rowHeaderAxisConfiguration != null) {
 			rowHeaderAxisConfiguration.eAdapters().add(tableListener);
 		}
 
-		source.eAdapters().add(tableListener);
+	}
+
+	/**
+	 * remove the listener
+	 */
+	private void removeListeners() {
+		//COLUMNS MANAGEMENT
+		//we add a listener on the columnHeaderAxisConfiguration
+		if(columnHeaderAxisConfiguration != null) {
+			columnHeaderAxisConfiguration.eAdapters().remove(tableListener);
+		}
+
+
+
+		if(this.columnLabelProviderConfigurations != null) {
+			//we add listener on all column label configurations
+			for(final ILabelProviderConfiguration conf : columnLabelProviderConfigurations) {
+				conf.eAdapters().remove(tableListener);
+			}
+		}
+
+		//ROW MANAGEMENT
+		//we add a listener on the rowHeaderAxisConfiguration
+		if(rowHeaderAxisConfiguration != null) {
+			rowHeaderAxisConfiguration.eAdapters().remove(tableListener);
+		}
 	}
 
 	/**
 	 * update all values in the property view
 	 */
 	private void updateValues() {
-		//we do the update with asyncExec to be sure that the new value will be set before to update it
+		//we do the update with asyncExec to be sure that the new values have been set before to update it
 		Display.getDefault().asyncExec(new Runnable() {
 
 			/**
@@ -143,23 +217,11 @@ public class NatTableModelElement extends EMFModelElement {
 			 */
 			@Override
 			public void run() {
-				if(columnHeaderAxisConfiguration != null) {
-					columnHeaderAxisConfiguration.eAdapters().remove(tableListener);
-				}
-				if(rowHeaderAxisConfiguration != null) {
-					rowHeaderAxisConfiguration.eAdapters().remove(tableListener);
-				}
-				columnHeaderAxisConfiguration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTable(getEditedTable());
-				rowHeaderAxisConfiguration = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTable(getEditedTable());
-				if(columnHeaderAxisConfiguration != null) {
-					columnHeaderAxisConfiguration.eAdapters().add(tableListener);
-				}
-				if(rowHeaderAxisConfiguration != null) {
-					rowHeaderAxisConfiguration.eAdapters().add(tableListener);
-				}
+				removeListeners();
+				initOtherFieldsAndAddOthersListeners();
 
-				Event event = new Event();
-				for(final AbstractAxisHeaderConfigurationElementObservableValue current : observableValues.values()) {
+				final Event event = new Event();
+				for(final AbstractConfigurationElementObservableValue current : observableValues.values()) {
 					current.handleEvent(event);
 				}
 			}
@@ -175,13 +237,9 @@ public class NatTableModelElement extends EMFModelElement {
 	public void dispose() {
 		super.dispose();
 		source.eAdapters().remove(tableListener);
-		if(columnHeaderAxisConfiguration != null) {
-			columnHeaderAxisConfiguration.eAdapters().remove(tableListener);
-		}
-		if(rowHeaderAxisConfiguration != null) {
-			rowHeaderAxisConfiguration.eAdapters().remove(tableListener);
-		}
+		removeListeners();
 		observableValues.clear();
+		columnLabelProviderConfigurations = null;
 	}
 
 
@@ -201,11 +259,11 @@ public class NatTableModelElement extends EMFModelElement {
 	 * @return
 	 */
 	@Override
-	protected IObservable doGetObservable(String propertyPath) {
-		AbstractAxisHeaderConfigurationElementObservableValue value = this.observableValues.get(propertyPath);
+	protected IObservable doGetObservable(final String propertyPath) {
+		AbstractConfigurationElementObservableValue value = this.observableValues.get(propertyPath);
 		if(value == null) {
 			Table table = getEditedTable();
-			//column properties
+			//column header properties
 			if(Constants.LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION_DISPLAY_FILTER.equals(propertyPath)) {
 				value = new ColumnDisplayFilterHeaderObservableValue(table);
 			} else if(Constants.LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION_DISPLAY_INDEX.equals(propertyPath)) {
@@ -214,17 +272,41 @@ public class NatTableModelElement extends EMFModelElement {
 				value = new ColumnDisplayLabelHeaderObservableValue(table);
 			} else if(Constants.LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION_INDEX_STYLE.equals(propertyPath)) {
 				value = new ColumnIndexHeaderStyleObservableValue(table);
-				//row property
+
+
+				//row header property
 			} else if(Constants.LOCAL_ROW_HEADER_AXIS_CONFIGURATION_DISPLAY_INDEX.equals(propertyPath)) {
 				value = new RowDisplayIndexHeaderObservableValue(table);
 			} else if(Constants.LOCAL_ROW_HEADER_AXIS_CONFIGURATION_DISPLAY_LABEL.equals(propertyPath)) {
 				value = new RowDisplayLabelHeaderObservableValue(table);
 			} else if(Constants.LOCAL_ROW_HEADER_AXIS_CONFIGURATION_INDEX_STYLE.equals(propertyPath)) {
 				value = new RowIndexHeaderStyleObservableValue(table);
+
+
+				//feature column label property
+			} else if(Constants.COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_ICON.equals(propertyPath)) {
+				value = new ColumnFeatureLabelDisplayIconObservableValue(table);
+			} else if(Constants.COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_LABEL.equals(propertyPath)) {
+				value = new ColumnFeatureLabelDisplayLabelObservableValue(table);
+			} else if(Constants.COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_IS_DERIVED.equals(propertyPath)) {
+				value = new ColumnFeatureLabelDisplayIsDerivedObservableValue(table);
+			} else if(Constants.COLUMN__FEATURE_LABEL_CONFIGURATION_DISPLAY_NAME.equals(propertyPath)) {
+				value = new ColumnFeatureLabelDisplayNameObservableValue(table);
+			} else if(Constants.COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_TYPE.equals(propertyPath)) {
+				value = new ColumnFeatureLabelDisplayTypeObservableValue(table);
+			} else if(Constants.COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_MULTIPLICITY.equals(propertyPath)) {
+				value = new ColumnFeatureLabelDisplayMultiplicityObservableValue(table);
+
+
+				//object column label property
+			} else if(Constants.COLUMN_OBJECT_LABEL_CONFIGURATION_DISPLAY_ICON.equals(propertyPath)) {
+				value = new ColumnObjectLabelDisplayIconObservableValue(table);
+			} else if(Constants.COLUMN_OBJECT_LABEL_CONFIGURATION_DISPLAY_LABEL.equals(propertyPath)) {
+				value = new ColumnObjectLabelDisplayLabelObservableValue(table);
 			}
 
 			if(value != null) {
-				this.observableValues.put(propertyPath, (AbstractAxisHeaderConfigurationElementObservableValue)value);
+				this.observableValues.put(propertyPath, (AbstractConfigurationElementObservableValue)value);
 			}
 		}
 		if(value != null) {
@@ -232,4 +314,38 @@ public class NatTableModelElement extends EMFModelElement {
 		}
 		return super.doGetObservable(propertyPath);
 	}
+
+	/**
+	 * 
+	 * @see org.eclipse.papyrus.views.properties.modelelement.EMFModelElement#isEditable(java.lang.String)
+	 * 
+	 * @param propertyPath
+	 * @return
+	 */
+	@Override
+	public boolean isEditable(String propertyPath) {
+		boolean res = super.isEditable(propertyPath);
+		if(!res) {
+			if(Constants.COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_ICON.equals(propertyPath)) {
+				res = true;
+			} else if(Constants.COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_LABEL.equals(propertyPath)) {
+				res = true;
+			} else if(Constants.COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_IS_DERIVED.equals(propertyPath)) {
+				res = true;
+			} else if(Constants.COLUMN__FEATURE_LABEL_CONFIGURATION_DISPLAY_NAME.equals(propertyPath)) {
+				res = true;
+			} else if(Constants.COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_TYPE.equals(propertyPath)) {
+				res = true;
+			} else if(Constants.COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_MULTIPLICITY.equals(propertyPath)) {
+				res = true;
+
+				//object column label property
+			} else if(Constants.COLUMN_OBJECT_LABEL_CONFIGURATION_DISPLAY_ICON.equals(propertyPath)) {
+				res = true;
+			} else if(Constants.COLUMN_OBJECT_LABEL_CONFIGURATION_DISPLAY_LABEL.equals(propertyPath)) {
+				res = true;
+			}
+		}
+		return res;
+	}
 }
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnFeatureLabelProviderConfigurationObservableValue.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnFeatureLabelProviderConfigurationObservableValue.java
new file mode 100644
index 00000000000..fca3458f013
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnFeatureLabelProviderConfigurationObservableValue.java
@@ -0,0 +1,72 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.command.TableCommands;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainuUtils;
+
+/**
+ * The Class AbstractColumnFeatureLabelProviderConfigurationObservableValue.
+ * 
+ * @author vl222926
+ */
+public abstract class AbstractColumnFeatureLabelProviderConfigurationObservableValue extends AbstractConfigurationElementObservableValue {
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param table
+	 *        the table
+	 * @param managedFeature
+	 *        the managed feature
+	 */
+	public AbstractColumnFeatureLabelProviderConfigurationObservableValue(final Table table, final EStructuralFeature managedFeature) {
+		super(table, managedFeature);
+	}
+
+	/**
+	 * Gets the edited e object.
+	 * 
+	 * @return the edited e object
+	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractConfigurationElementObservableValue#getEditedEObject()
+	 */
+	@Override
+	protected EObject getEditedEObject() {
+		return LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(getTable());
+	}
+
+	/**
+	 * Do set value.
+	 * 
+	 * @param value
+	 *        the value
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+	 */
+	@Override
+	protected void doSetValue(Object value) {
+		final ICommand cmd = TableCommands.getSetColumnFeatureLabelConfigurationValueCommand(getTable(), (ILabelProviderConfiguration)getEditedEObject(), getManagedFeature(), value);
+		final TransactionalEditingDomain domain = TableEditingDomainuUtils.getTableEditingDomain(getTable());
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+	}
+	
+
+}
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnHeaderAxisConfigurationObservableValue.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnHeaderAxisConfigurationObservableValue.java
index 60ea35ffc9b..4cb57cee409 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnHeaderAxisConfigurationObservableValue.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnHeaderAxisConfigurationObservableValue.java
@@ -13,15 +13,15 @@
  *****************************************************************************/
 package org.eclipse.papyrus.infra.nattable.properties.observable;
 
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.nattable.command.TableCommands;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainuUtils;
 import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainuUtils;
 
 /**
  * Abstract class for the columnHeaderAxisConfiguration
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagemen
  * @author vl222926
  * 
  */
-public abstract class AbstractColumnHeaderAxisConfigurationObservableValue extends AbstractAxisHeaderConfigurationElementObservableValue {
+public abstract class AbstractColumnHeaderAxisConfigurationObservableValue extends AbstractConfigurationElementObservableValue {
 
 	/**
 	 * 
@@ -50,7 +50,7 @@ public abstract class AbstractColumnHeaderAxisConfigurationObservableValue exten
 	 *         the header axis configuration to use to get the value
 	 */
 	@Override
-	protected final AbstractHeaderAxisConfiguration getManagedConfiguration() {
+	protected final EObject getEditedEObject() {
 		return HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisUsedInTable(getTable());
 	}
 
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnObjectLabelProviderConfigurationObservableValue.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnObjectLabelProviderConfigurationObservableValue.java
new file mode 100644
index 00000000000..8a64995f412
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractColumnObjectLabelProviderConfigurationObservableValue.java
@@ -0,0 +1,70 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.command.TableCommands;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
+import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainuUtils;
+
+/**
+ * The Class AbstractColumnObjectLabelProviderConfigurationObservableValue.
+ * 
+ * @author vl222926
+ */
+public abstract class AbstractColumnObjectLabelProviderConfigurationObservableValue extends AbstractConfigurationElementObservableValue {
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param table
+	 *        the table
+	 * @param managedFeature
+	 *        the managed feature
+	 */
+	public AbstractColumnObjectLabelProviderConfigurationObservableValue(final Table table, final EStructuralFeature managedFeature) {
+		super(table, managedFeature);
+	}
+
+	/**
+	 * Gets the edited e object.
+	 * 
+	 * @return the edited e object
+	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractConfigurationElementObservableValue#getEditedEObject()
+	 */
+	@Override
+	protected EObject getEditedEObject() {
+		return LabelConfigurationManagementUtils.getUsedColumnObjectLabelConfiguration(getTable());
+	}
+
+	/**
+	 * Do set value.
+	 * 
+	 * @param value
+	 *        the value
+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+	 */
+	@Override
+	protected void doSetValue(Object value) {
+		final ICommand cmd = TableCommands.getSetColumnFeatureLabelConfigurationValueCommand(getTable(), (ILabelProviderConfiguration)getEditedEObject(), getManagedFeature(), value);
+		final TransactionalEditingDomain domain = TableEditingDomainuUtils.getTableEditingDomain(getTable());
+		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+	}
+}
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractAxisHeaderConfigurationElementObservableValue.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractConfigurationElementObservableValue.java
index f1568dc3ed2..51aee440c3f 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractAxisHeaderConfigurationElementObservableValue.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractConfigurationElementObservableValue.java
@@ -15,9 +15,9 @@ package org.eclipse.papyrus.infra.nattable.properties.observable;
 
 import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
 import org.eclipse.core.databinding.observable.value.ValueDiff;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 
@@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Listener;
  * @author vl222926
  * 
  */
-public abstract class AbstractAxisHeaderConfigurationElementObservableValue extends AbstractObservableValue implements Listener {
+public abstract class AbstractConfigurationElementObservableValue extends AbstractObservableValue implements Listener {
 
 	/**
 	 * the managed table
@@ -53,7 +53,7 @@ public abstract class AbstractAxisHeaderConfigurationElementObservableValue exte
 	 * @param managedFeature
 	 *        the managed feature
 	 */
-	public AbstractAxisHeaderConfigurationElementObservableValue(final Table table, final EStructuralFeature managedFeature) {
+	public AbstractConfigurationElementObservableValue(final Table table, final EStructuralFeature managedFeature) {
 		this.table = table;
 		this.managedFeature = managedFeature;
 		oldValue = doGetValue();
@@ -68,7 +68,11 @@ public abstract class AbstractAxisHeaderConfigurationElementObservableValue exte
 	 */
 	@Override
 	protected Object doGetValue() {
-		return getManagedConfiguration().eGet(managedFeature);
+		EObject editedObject = getEditedEObject();
+		if(editedObject != null) {
+			return editedObject.eGet(getManagedFeature());
+		}
+		return null;
 	}
 
 
@@ -86,7 +90,7 @@ public abstract class AbstractAxisHeaderConfigurationElementObservableValue exte
 	 * @return
 	 *         the managed axis configuration
 	 */
-	protected abstract AbstractHeaderAxisConfiguration getManagedConfiguration();
+	protected abstract EObject getEditedEObject();
 
 	/**
 	 * 
@@ -97,7 +101,8 @@ public abstract class AbstractAxisHeaderConfigurationElementObservableValue exte
 	@Override
 	public void handleEvent(Event event) {
 		final Object newValue = doGetValue();
-		if(!oldValue.equals(newValue)) {
+		//big test required to avoid NPE when we receive event during the exchange of the axis
+		if((newValue != oldValue) && ((newValue != null && oldValue == null) || newValue == null && oldValue != null || !oldValue.equals(newValue))) {
 			final Object localOldValue = oldValue;
 			oldValue = newValue;
 			fireValueChange(new ValueDiff() {
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowHeaderAxisConfigurationObservableValue.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowHeaderAxisConfigurationObservableValue.java
index d399e98c0d8..a82250bb84d 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowHeaderAxisConfigurationObservableValue.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/AbstractRowHeaderAxisConfigurationObservableValue.java
@@ -13,15 +13,15 @@
  *****************************************************************************/
 package org.eclipse.papyrus.infra.nattable.properties.observable;
 
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.nattable.command.TableCommands;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainuUtils;
 import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainuUtils;
 
 /**
  * Abstract class for the rowHeaderAxisConfiguration
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagemen
  * @author vl222926
  * 
  */
-public abstract class AbstractRowHeaderAxisConfigurationObservableValue extends AbstractAxisHeaderConfigurationElementObservableValue {
+public abstract class AbstractRowHeaderAxisConfigurationObservableValue extends AbstractConfigurationElementObservableValue {
 
 	/**
 	 * 
@@ -46,12 +46,12 @@ public abstract class AbstractRowHeaderAxisConfigurationObservableValue extends
 
 	/**
 	 * 
-	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractAxisHeaderConfigurationElementObservableValue#getManagedConfiguration()
+	 * @see org.eclipse.papyrus.infra.nattable.properties.observable.AbstractConfigurationElementObservableValue#getEditedEObject()
 	 * 
 	 * @return
 	 */
 	@Override
-	protected final AbstractHeaderAxisConfiguration getManagedConfiguration() {
+	protected final EObject getEditedEObject() {
 		return HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(getTable());
 	}
 
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIconObservableValue.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIconObservableValue.java
new file mode 100644
index 00000000000..4739cc2f63e
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIconObservableValue.java
@@ -0,0 +1,47 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+/**
+ * The Class ColumnFeatureLabelDisplayIconObservableValue.
+ * 
+ * @author VL222926
+ */
+public class ColumnFeatureLabelDisplayIconObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param table
+	 *        the table
+	 */
+	public ColumnFeatureLabelDisplayIconObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());
+	}
+
+	/**
+	 * Gets the value type.
+	 * 
+	 * @return the value type
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 */
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+}
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIsDerivedObservableValue.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIsDerivedObservableValue.java
new file mode 100644
index 00000000000..83c1e6b3c34
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayIsDerivedObservableValue.java
@@ -0,0 +1,47 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayIsDerivedObservableValue.
+ */
+public class ColumnFeatureLabelDisplayIsDerivedObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display is derived observable value.
+	 * 
+	 * @param table
+	 *        the table
+	 */
+	public ColumnFeatureLabelDisplayIsDerivedObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 * 
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+}
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayLabelObservableValue.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayLabelObservableValue.java
new file mode 100644
index 00000000000..b754cacbf2a
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayLabelObservableValue.java
@@ -0,0 +1,50 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayLabelObservableValue.
+ */
+public class ColumnFeatureLabelDisplayLabelObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display label observable value.
+	 * 
+	 * @param table
+	 *        the table
+	 */
+	public ColumnFeatureLabelDisplayLabelObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 * 
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+
+}
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayMultiplicityObservableValue.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayMultiplicityObservableValue.java
new file mode 100644
index 00000000000..29ebc6b4f72
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayMultiplicityObservableValue.java
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayMultiplicityObservableValue.
+ */
+public class ColumnFeatureLabelDisplayMultiplicityObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display multiplicity observable value.
+	 * 
+	 * @param table
+	 *        the table
+	 */
+	public ColumnFeatureLabelDisplayMultiplicityObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 * 
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayNameObservableValue.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayNameObservableValue.java
new file mode 100644
index 00000000000..b073144112c
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayNameObservableValue.java
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayNameObservableValue.
+ */
+public class ColumnFeatureLabelDisplayNameObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display name observable value.
+	 * 
+	 * @param table
+	 *        the table
+	 */
+	public ColumnFeatureLabelDisplayNameObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 * 
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayTypeObservableValue.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayTypeObservableValue.java
new file mode 100644
index 00000000000..2d181567ff6
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnFeatureLabelDisplayTypeObservableValue.java
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnFeatureLabelDisplayTypeObservableValue.
+ */
+public class ColumnFeatureLabelDisplayTypeObservableValue extends AbstractColumnFeatureLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column feature label display type observable value.
+	 * 
+	 * @param table
+	 *        the table
+	 */
+	public ColumnFeatureLabelDisplayTypeObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 * 
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+}
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayIconObservableValue.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayIconObservableValue.java
new file mode 100644
index 00000000000..cc42b2597b3
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayIconObservableValue.java
@@ -0,0 +1,50 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnObjectLabelDisplayIconObservableValue.
+ */
+public class ColumnObjectLabelDisplayIconObservableValue extends AbstractColumnObjectLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column object label display icon observable value.
+	 * 
+	 * @param table
+	 *        the table
+	 */
+	public ColumnObjectLabelDisplayIconObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 * 
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+
+}
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayLabelObservableValue.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayLabelObservableValue.java
new file mode 100644
index 00000000000..86b17a9f777
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/observable/ColumnObjectLabelDisplayLabelObservableValue.java
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.properties.observable;
+
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
+
+
+/**
+ * The Class ColumnObjectLabelDisplayLabelObservableValue.
+ */
+public class ColumnObjectLabelDisplayLabelObservableValue extends AbstractColumnObjectLabelProviderConfigurationObservableValue {
+
+	/**
+	 * Instantiates a new column object label display label observable value.
+	 * 
+	 * @param table
+	 *        the table
+	 */
+	public ColumnObjectLabelDisplayLabelObservableValue(Table table) {
+		super(table, NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel());
+	}
+
+	/**
+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+	 * 
+	 * @return
+	 */
+
+	@Override
+	public Object getValueType() {
+		return EcorePackage.eINSTANCE.getEBoolean();
+	}
+
+
+
+}
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/utils/Constants.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/utils/Constants.java
index 466ebb92eda..4afd54f04f6 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/utils/Constants.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.properties/src/org/eclipse/papyrus/infra/nattable/properties/utils/Constants.java
@@ -25,7 +25,7 @@ public class Constants {
 		//to prevent instanciation
 	}
 
-	
+
 	public static final String LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION_DISPLAY_LABEL = "localColumnHeaderAxisConfiguration.displayLabel"; //$NON-NLS-1$
 
 	public static final String LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION_DISPLAY_FILTER = "localColumnHeaderAxisConfiguration.displayFilter"; //$NON-NLS-1$
@@ -39,4 +39,27 @@ public class Constants {
 	public static final String LOCAL_ROW_HEADER_AXIS_CONFIGURATION_DISPLAY_INDEX = "localRowHeaderAxisConfiguration.displayIndex"; //$NON-NLS-1$
 
 	public static final String LOCAL_ROW_HEADER_AXIS_CONFIGURATION_INDEX_STYLE = "localRowHeaderAxisConfiguration.indexStyle"; //$NON-NLS-1$
+
+	public static final String COLUMN_FEATURE_LABEL_PROPERTY_PREFIX = "nattable:table:localColumnHeaderAxisConfiguration:ownedLabelConfigurations:featureLabelProviderConfiguration";
+
+
+
+	public static final String COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_ICON = "columnFeatureLabelProviderConfigurationDisplayIcon"; //$NON-NLS-1$
+
+	public static final String COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_LABEL = "columnFeatureLabelProviderConfigurationDisplayLabel"; //$NON-NLS-1$
+
+	public static final String COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_IS_DERIVED = "columnFeatureLabelProviderConfigurationDisplayIsDerived"; //$NON-NLS-1$
+
+	public static final String COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_TYPE = "columnFeatureLabelProviderConfigurationDisplayType"; //$NON-NLS-1$
+
+	public static final String COLUMN_FEATURE_LABEL_CONFIGURATION_DISPLAY_MULTIPLICITY = "columnFeatureLabelProviderConfigurationDisplayMultiplicity"; //$NON-NLS-1$
+
+	public static final String COLUMN__FEATURE_LABEL_CONFIGURATION_DISPLAY_NAME = "columnFeatureLabelProviderConfigurationDisplayName"; //$NON-NLS-1$
+
+
+
+	public static final String COLUMN_OBJECT_LABEL_CONFIGURATION_DISPLAY_ICON = "columnObjectLabelProviderConfigurationDisplayIcon"; //$NON-NLS-1$
+
+	public static final String COLUMN_OBJECT_LABEL_CONFIGURATION_DISPLAY_LABEL = "columnObjectLabelProviderConfigurationDisplayLabel"; //$NON-NLS-1$
+
 }
diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
index ea3b94874d5..a8b54060683 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
@@ -13,17 +13,29 @@
  *****************************************************************************/
 package org.eclipse.papyrus.infra.nattable.command;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;
-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainuUtils;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;
 import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainuUtils;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 
@@ -114,5 +126,106 @@ public class TableCommands {
 		return compositeCommand;
 	}
 
+	/**
+	 * 
+	 * @param table
+	 *        the table
+	 * @param usedLabelConfiguration
+	 *        the used label configuration
+	 * @param editedFeature
+	 *        the edited feature
+	 * @param newValue
+	 *        the new value for this feature
+	 * @return
+	 *         the command to modify the feature value in the label configuration of the table. This command adds the localLabelConfiguration when it
+	 *         is required
+	 */
+	//FIXME the handler must use me
+	public static final ICommand getSetColumnFeatureLabelConfigurationValueCommand(final Table table, final ILabelProviderConfiguration usedLabelConfiguration, final EStructuralFeature editedFeature, final Object newValue) {
+		final CompositeCommand cmd = new CompositeCommand("ChangeColumnLabelConfigurationValueCommand"); //$NON-NLS-1$
+		TransactionalEditingDomain domain = TableEditingDomainuUtils.getTableEditingDomain(table);
+		ILabelProviderConfiguration editedLabelConf;
+		if(usedLabelConfiguration.eContainer() instanceof TableHeaderAxisConfiguration) {
+			editedLabelConf = EcoreUtil.copy(usedLabelConfiguration);
+			cmd.add(getRegisterLocalColumnLabelConfigurationCommand(table, usedLabelConfiguration, editedLabelConf));
+		} else {
+			editedLabelConf = usedLabelConfiguration;
+		}
+		final IEditCommandRequest request = new SetRequest(domain, editedLabelConf, editedFeature, newValue);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedLabelConf);
+		cmd.add(provider.getEditCommand(request));
+		return cmd;
+	}
 
+	/**
+	 * 
+	 * @param table
+	 *        the table
+	 * @param tableLabelConfiguration
+	 *        the table LabelConfiguration
+	 * @param localTableLabelConfiguration
+	 *        the local table label configuration
+	 * @return
+	 *         the command to register the local column label configuration to the table
+	 */
+	private static final ICommand getRegisterLocalColumnLabelConfigurationCommand(final Table table, ILabelProviderConfiguration tableLabelConfiguration, ILabelProviderConfiguration localTableLabelConfiguration) {
+		TransactionalEditingDomain domain = TableEditingDomainuUtils.getTableEditingDomain(table);
+		final CompositeCommand cmd = new CompositeCommand("ChangeHeaderLabelConfigurationCommand"); //$NON-NLS-1$
+
+		//1. we must get or create the required LocalTableHeaderAxisConfiguration
+		AbstractHeaderAxisConfiguration configuration = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisUsedInTable(table);
+		LocalTableHeaderAxisConfiguration localConfig = null;
+		if(configuration instanceof LocalTableHeaderAxisConfiguration) {
+			localConfig = (LocalTableHeaderAxisConfiguration)configuration;
+		} else if(configuration instanceof TableHeaderAxisConfiguration) {
+			//we can't edit it, because it's comes from the initial configuration
+			configuration = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration)configuration);
+			localConfig = (LocalTableHeaderAxisConfiguration)configuration;
+			EStructuralFeature axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();
+			if(!table.isInvertAxis()) {
+				axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();
+			}
+			final IEditCommandRequest request = new SetRequest(domain, table, axisConfigurationFeature, configuration);
+			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);
+			cmd.add(provider.getEditCommand(request));
+		}
+
+		//2. this one must store the new label configuration
+		final IEditCommandRequest request = new SetRequest(domain, configuration, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), localTableLabelConfiguration);
+		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(configuration);
+		cmd.add(provider.getEditCommand(request));
+
+		//3. we must get or create the AxisManagerConfiguration(s)
+		final TableHeaderAxisConfiguration headerAxisConfig = (TableHeaderAxisConfiguration)HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);
+
+		final List<AxisManagerConfiguration> axisManagerConfiguration = new ArrayList<AxisManagerConfiguration>();
+		for(final AxisManagerRepresentation current : headerAxisConfig.getAxisManagers()) {
+			//we look for defined axis manager which uses the labelconfiguration defined in the table config
+			if(current.getHeaderLabelConfiguration() == tableLabelConfiguration) {
+				AxisManagerConfiguration currentConf = null;
+				//we look for an axis manager configuration mapped in this axis manager representation
+				for(final AxisManagerConfiguration axisConf : localConfig.getAxisManagerConfigurations()) {
+					if(axisConf.getAxisManager() == current) {
+						currentConf = axisConf;
+					}
+				}
+				if(currentConf == null) {
+					currentConf = NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration();
+					currentConf.setAxisManager(current);
+					final IEditCommandRequest request2 = new SetRequest(domain, localConfig, NattableaxisconfigurationPackage.eINSTANCE.getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations(), currentConf);
+					final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(localConfig);
+					cmd.add(provider2.getEditCommand(request2));
+				}
+				axisManagerConfiguration.add(currentConf);
+			}
+		}
+
+		//4. these one must reference the LabelConfiguration
+		for(final AxisManagerConfiguration current : axisManagerConfiguration) {
+			final IEditCommandRequest request2 = new SetRequest(domain, current, NattableaxisconfigurationPackage.eINSTANCE.getAxisManagerConfiguration_LocalHeaderLabelConfiguration(), localTableLabelConfiguration);
+			final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(current);
+			cmd.add(provider2.getEditCommand(request2));
+		}
+		return cmd;
+	}
 }
author	vlorenzo	2013-06-27 13:58:41 +0000
committer	vlorenzo	2013-06-27 13:58:41 +0000
commit	a8db40932a4717da231b58535aeec3e28910ebc4 (patch)
tree	7426b6cb05cfd91d83e05c0c74b00b094c0669d7 /extraplugins
parent	2a197d50a20424f89052ceee4a94ef5a2e4bf7fc (diff)
download	org.eclipse.papyrus-a8db40932a4717da231b58535aeec3e28910ebc4.tar.gz org.eclipse.papyrus-a8db40932a4717da231b58535aeec3e28910ebc4.tar.xz org.eclipse.papyrus-a8db40932a4717da231b58535aeec3e28910ebc4.zip