91 files changed, 0 insertions, 18780 deletions
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/.classpath b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/.classpath
deleted file mode 100644
index 8aeab6132e0..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/.project b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/.project
deleted file mode 100644
index a3bcea911c8..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.infra.nattable.model</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.core.resources.prefs b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 5c09a544840..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-encoding//model/DefaultName.ecore=UTF-8
-encoding//model/DefaultName.ecorediag=UTF-8
-encoding//model/nattable.ecorediag=UTF-8
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
deleted file mode 100644
index bdeb0548081..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.Activator
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.papyrus.infra.nattable.model;visibility:=reexport;bundle-version="0.10.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.papyrus.infra.nattable.model,
- org.eclipse.papyrus.infra.nattable.model.nattable,
- org.eclipse.papyrus.infra.nattable.model.nattable.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl,
- org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.util,
- org.eclipse.papyrus.infra.nattable.model.nattable.util
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/about.html b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/build.properties b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/build.properties
deleted file mode 100644
index bf31424da52..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
-
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               plugin.pdoc
-jars.compile.order = .
-source.. = src-gen/
-output.. = bin/
-src.includes = about.html
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/lastRemiVersion/nattable.ecore b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/lastRemiVersion/nattable.ecore
deleted file mode 100644
index d1b6f98924a..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/lastRemiVersion/nattable.ecore
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="nattable" nsURI="http://www.eclipse.org/papyrus/nattable/model"
-    nsPrefix="nattable">
-  <eClassifiers xsi:type="ecore:EClass" name="Table" eSuperTypes="#//nattableconfiguration/TableNamedElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="context" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tableConfiguration" lowerBound="1"
-        eType="#//nattableconfiguration/TableConfiguration"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="invertAxis" lowerBound="1"
-        eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="columnAxisProvidersHistory"
-        lowerBound="1" upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rowAxisProvidersHistory"
-        lowerBound="1" upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="localRowAxisConfiguration"
-        eType="#//LocalTableAxisConfiguration" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="localColumnAxisConfiguration"
-        eType="#//LocalTableAxisConfiguration" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="currentRowAxisProvider"
-        lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="currentColumnAxisManager"
-        lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IAxis" abstract="true" interface="true"
-      eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
-    <eOperations name="getElement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
-    <eOperations name="getLocalLabelConfiguration" eType="#//nattablelabelprovider/AbstractLabelConfiguration"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IdAxis" abstract="true" eSuperTypes="#//IAxis">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="element" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EObjectAxis" eSuperTypes="#//ObjectAxis">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MasterAxisProvider" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="pastedElementContainmentFeature"
-        eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SlaveAxisProvider" interface="true"
-      eSuperTypes="#//AxisProvider"/>
-  <eClassifiers xsi:type="ecore:EClass" name="TableAxisConfiguration" eSuperTypes="#//nattableaxisconfiguration/AbstractAxisConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="axisManagers" lowerBound="1"
-        upperBound="-1" eType="#//AxisManager" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AxisManager">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="labelConfiguration" lowerBound="1"
-        eType="#//nattablelabelprovider/AbstractLabelConfiguration"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaAxisManagerId" lowerBound="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SynchronizedAxisProvider" eSuperTypes="#//AxisProvider"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AxisProvider" eSuperTypes="#//nattableaxisprovider/AbstractAxisProvider">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="axis" upperBound="-1" eType="#//IAxis"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureAxis" abstract="true" eSuperTypes="#//SlaveAxisProvider">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="localLabelConfiguration"
-        eType="#//nattablelabelprovider/FeatureLabelProviderConfiguration"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ObjectAxis" abstract="true" eSuperTypes="#//IAxis">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="localLabelConfiguration"
-        eType="#//nattablelabelprovider/ObjectLabelProviderConfiguration"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureIdAxis" eSuperTypes="#//IdAxis #//FeatureAxis"/>
-  <eClassifiers xsi:type="ecore:EClass" name="EMFFeatureAxis" eSuperTypes="#//FeatureAxis">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ObjectIdAxis" eSuperTypes="#//IdAxis #//ObjectAxis"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AxisManagerConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="localLabelConfiguration"
-        eType="#//nattablelabelprovider/AbstractLabelConfiguration"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaAxisManagerId" lowerBound="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LocalTableAxisConfiguration" eSuperTypes="#//nattableaxisconfiguration/AbstractAxisConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="axisManagerConfigurations"
-        upperBound="-1" eType="#//AxisManagerConfiguration" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureAxisManager" eSuperTypes="#//AxisManager">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="showOnlyCommonFeature"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureAxisManagerConfiguration" eSuperTypes="#//AxisManagerConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="showOnlyCommonFeature"/>
-  </eClassifiers>
-  <eSubpackages name="nattableconfiguration" nsURI="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"
-      nsPrefix="nattableconfiguration">
-    <eClassifiers xsi:type="ecore:EClass" name="TableNamedElement" abstract="true"
-        eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TableConfiguration" eSuperTypes="#//nattableconfiguration/TableNamedElement">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="creationTester" eType="#//nattabletester/AbstractTableTester"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="cellEditorDeclaration"
-          lowerBound="1" eType="#//nattableconfiguration/CellEditorDeclaration" defaultValueLiteral="COLUMN"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="rowAxisConfiguration"
-          lowerBound="1" eType="#//TableAxisConfiguration" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="columnAxisConfiguration"
-          lowerBound="1" eType="#//TableAxisConfiguration" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="columnAxisProviders"
-          lowerBound="1" upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="rowAxisProviders" lowerBound="1"
-          upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="defaultRowAxisProvider"
-          lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="defaultColumnAxisProvider"
-          eType="#//nattableaxisprovider/AbstractAxisProvider"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="CellEditorDeclaration">
-      <eLiterals name="COLUMN"/>
-      <eLiterals name="ROW" value="1"/>
-      <eLiterals name="CELL" value="2"/>
-    </eClassifiers>
-  </eSubpackages>
-  <eSubpackages name="nattableaxisprovider" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"
-      nsPrefix="nattableaxisprovider">
-    <eClassifiers xsi:type="ecore:EClass" name="AbstractAxisProvider" abstract="true"
-        interface="true" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement #//nattableconfiguration/TableNamedElement">
-      <eOperations name="getAxis" upperBound="-1" eType="#//IAxis"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="DefaultAxisProvider" abstract="true"/>
-    <eClassifiers xsi:type="ecore:EClass" name="EMFFeatureValueAxisProvider" eSuperTypes="#//MasterAxisProvider #//SynchronizedAxisProvider">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="listenFeature" lowerBound="1"
-          eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
-    </eClassifiers>
-  </eSubpackages>
-  <eSubpackages name="nattablelabelprovider" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"
-      nsPrefix="nattablelabelprovider">
-    <eClassifiers xsi:type="ecore:EClass" name="AbstractLabelConfiguration" abstract="true"
-        eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelProviderContext"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="FeatureLabelProviderConfiguration"
-        eSuperTypes="#//nattablelabelprovider/ObjectLabelProviderConfiguration">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayIsDerived" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayType" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayMultiplicity"
-          lowerBound="1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="ObjectLabelProviderConfiguration"
-        eSuperTypes="#//nattablelabelprovider/AbstractLabelConfiguration">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayIcon" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayLabel" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-    </eClassifiers>
-  </eSubpackages>
-  <eSubpackages name="nattableaxisconfiguration" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"
-      nsPrefix="nattableaxisconfiguration">
-    <eClassifiers xsi:type="ecore:EClass" name="AbstractAxisConfiguration" abstract="true"
-        eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="ownedLabelConfiguration"
-          upperBound="-1" eType="#//nattablelabelprovider/AbstractLabelConfiguration"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="indexStyle" lowerBound="1"
-          eType="#//nattableaxisconfiguration/AxisIndexStyle"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayLabel" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayFilter" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="false"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayIndex" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="DefaultAxisConfiguration"/>
-    <eClassifiers xsi:type="ecore:EEnum" name="AxisIndexStyle">
-      <eLiterals name="NUMERIC" literal="NUMERIC"/>
-      <eLiterals name="ALPHABETIC" value="1" literal="ALPHABETIC"/>
-    </eClassifiers>
-  </eSubpackages>
-  <eSubpackages name="nattabletester" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"
-      nsPrefix="nattabletester">
-    <eClassifiers xsi:type="ecore:EClass" name="AbstractTableTester" abstract="true"
-        eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
-      <eOperations name="getTester" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="JavaTableTester" eSuperTypes="#//nattabletester/AbstractTableTester">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="tester" lowerBound="1"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eClassifiers>
-  </eSubpackages>
-</ecore:EPackage>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/lastRemiVersion/nattable.ecorediag b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/lastRemiVersion/nattable.ecorediag
deleted file mode 100644
index 57df2105289..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/lastRemiVersion/nattable.ecorediag
+++ /dev/null
@@ -1,975 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattable.ecorediag" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_WQhxYJewEeKr0Yypv4rfLA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_WQhxY5ewEeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_WQhxZJewEeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_WQhxZZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_WQhxZpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WQhxZ5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_WQhxaJewEeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_WQhxaZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_WQhxapewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WQhxa5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_WQhxYZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//Table"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WQhxYpewEeKr0Yypv4rfLA" x="2040" y="1095" width="232" height="208"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_XW48gJewEeKr0Yypv4rfLA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_XW48g5ewEeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_XW48hJewEeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_XW48hZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_XW48hpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_XW48h5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_XW48iJewEeKr0Yypv4rfLA" type="5002">
-      <children xmi:type="notation:Node" xmi:id="_XW48jJewEeKr0Yypv4rfLA" type="2002">
-        <element xmi:type="ecore:EOperation" href="nattable.ecore#//IAxis/getElement"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XW48jZewEeKr0Yypv4rfLA"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_OIO7kKEnEeKEtanfuQnMXQ" type="2002">
-        <element xmi:type="ecore:EOperation" href="nattable.ecore#//IAxis/getLocalLabelConfiguration"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OIO7kaEnEeKEtanfuQnMXQ"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_XW48iZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_XW48ipewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_XW48i5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_XW48gZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//IAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XW48gpewEeKr0Yypv4rfLA" x="765" y="710"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_Xmqd4JewEeKr0Yypv4rfLA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_Xmqd45ewEeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_Xmqd5JewEeKr0Yypv4rfLA" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_Xm0O4JewEeKr0Yypv4rfLA" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//IdAxis/element"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Xm0O4ZewEeKr0Yypv4rfLA"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Xmqd5ZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Xmqd5pewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Xmqd55ewEeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Xmqd6JewEeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Xmqd6ZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Xmqd6pewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Xmqd65ewEeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Xmqd4ZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//IdAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xmqd4pewEeKr0Yypv4rfLA" x="920" y="835" width="203"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_X9uTAJewEeKr0Yypv4rfLA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_X9uTA5ewEeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_X9uTBJewEeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_X9uTBZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_X9uTBpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_X9uTB5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_X9uTCJewEeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_X9uTCZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_X9uTCpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_X9uTC5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_X9uTAZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//EObjectAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X9uTApewEeKr0Yypv4rfLA" x="735" y="1035" width="113" height="53"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_b7-RQJewEeKr0Yypv4rfLA" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b8RMNJewEeKr0Yypv4rfLA" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b8RMNZewEeKr0Yypv4rfLA" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_b7-RQ5ewEeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_b7-RRJewEeKr0Yypv4rfLA" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_b8ICQpewEeKr0Yypv4rfLA" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableNamedElement/name"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_b8ICQ5ewEeKr0Yypv4rfLA"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_b8ICRJewEeKr0Yypv4rfLA" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableNamedElement/description"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_b8ICRZewEeKr0Yypv4rfLA"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_b7-RRZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_b7-RRpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_b7-RR5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_b7-RSJewEeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_b7-RSZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_b7-RSpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_b7-RS5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_b7-RQZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/TableNamedElement"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b7-RQpewEeKr0Yypv4rfLA" x="2065" y="45" width="193"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_dKFDIJewEeKr0Yypv4rfLA" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dKX-EJewEeKr0Yypv4rfLA" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dKX-EZewEeKr0Yypv4rfLA" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_dKO0IJewEeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_dKO0IZewEeKr0Yypv4rfLA" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_dKO0KZewEeKr0Yypv4rfLA" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableConfiguration/type"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_dKO0KpewEeKr0Yypv4rfLA"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_dKO0K5ewEeKr0Yypv4rfLA" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableConfiguration/iconPath"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_dKO0LJewEeKr0Yypv4rfLA"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_b8ICQJewEeKr0Yypv4rfLA" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableConfiguration/cellEditorDeclaration"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_b8ICQZewEeKr0Yypv4rfLA"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_dKO0IpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dKO0I5ewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dKO0JJewEeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_dKO0JZewEeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_dKO0JpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dKO0J5ewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dKO0KJewEeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_dKFDIZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/TableConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dKFDIpewEeKr0Yypv4rfLA" x="1905" y="355" height="178"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_g6WPwJewEeKr0Yypv4rfLA" type="1005">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_g6pKsJewEeKr0Yypv4rfLA" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_g6pKsZewEeKr0Yypv4rfLA" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_g6gAwJewEeKr0Yypv4rfLA" type="4010"/>
-    <children xmi:type="notation:Node" xmi:id="_g6gAwZewEeKr0Yypv4rfLA" type="5008">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_g6gAwpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_g6gAw5ewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_g6gAxJewEeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_g6WPwZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableconfiguration/CellEditorDeclaration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g6WPwpewEeKr0Yypv4rfLA" x="10" y="20"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_ibpDYJewEeKr0Yypv4rfLA" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ib7-UJewEeKr0Yypv4rfLA" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ib7-UZewEeKr0Yypv4rfLA" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_ibpDY5ewEeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_ibpDZJewEeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ibpDZZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ibpDZpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ibpDZ5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_ibpDaJewEeKr0Yypv4rfLA" type="5002">
-      <children xmi:type="notation:Node" xmi:id="_naeSVKEbEeKEtanfuQnMXQ" type="2002">
-        <element xmi:type="ecore:EOperation" href="nattable.ecore#//nattableaxisprovider/AbstractAxisProvider/getAxis"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_naeSVaEbEeKEtanfuQnMXQ"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ibpDaZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ibpDapewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ibpDa5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ibpDYZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AbstractAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ibpDYpewEeKr0Yypv4rfLA" x="1430" y="420"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_i5ZWYJewEeKr0Yypv4rfLA" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_i5jHZJewEeKr0Yypv4rfLA" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_i5jHZZewEeKr0Yypv4rfLA" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_i5ZWY5ewEeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_i5ZWZJewEeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_i5ZWZZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_i5ZWZpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_i5ZWZ5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_i5ZWaJewEeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_i5ZWaZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_i5ZWapewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_i5ZWa5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_i5ZWYZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/EMFFeatureValueAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i5ZWYpewEeKr0Yypv4rfLA" x="225" y="730" width="208" height="93"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_jpJ_YJewEeKr0Yypv4rfLA" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jpTJUpewEeKr0Yypv4rfLA" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jpTJU5ewEeKr0Yypv4rfLA" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_jpJ_Y5ewEeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_jpJ_ZJewEeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_jpJ_ZZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_jpJ_ZpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpJ_Z5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_jpJ_aJewEeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_jpJ_aZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_jpJ_apewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_jpJ_a5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_jpJ_YZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/AbstractLabelConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jpJ_YpewEeKr0Yypv4rfLA" x="55" y="605"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_j3SiAJewEeKr0Yypv4rfLA" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_j3lc8JewEeKr0Yypv4rfLA" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_j3lc8ZewEeKr0Yypv4rfLA" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_j3SiA5ewEeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_j3SiBJewEeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_j3SiBZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_j3SiBpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_j3SiB5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_j3SiCJewEeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_j3SiCZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_j3SiCpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_j3SiC5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_j3SiAZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/FeatureLabelProviderConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j3SiApewEeKr0Yypv4rfLA" x="80" y="1160"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_kHzDMJewEeKr0Yypv4rfLA" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kIGlMJewEeKr0Yypv4rfLA" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kIGlMZewEeKr0Yypv4rfLA" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_kHzDM5ewEeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_kHzDNJewEeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_kHzDNZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_kHzDNpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kHzDN5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_kHzDOJewEeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_kHzDOZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_kHzDOpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kHzDO5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_kHzDMZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/ObjectLabelProviderConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kHzDMpewEeKr0Yypv4rfLA" x="55" y="935"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_kk9gUJewEeKr0Yypv4rfLA" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_klQbQJewEeKr0Yypv4rfLA" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_klQbQZewEeKr0Yypv4rfLA" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_kk9gU5ewEeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_kk9gVJewEeKr0Yypv4rfLA" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_k0bfvJewEeKr0Yypv4rfLA" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableaxisconfiguration/AbstractAxisConfiguration/indexStyle"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_k0bfvZewEeKr0Yypv4rfLA"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_k0bfwJewEeKr0Yypv4rfLA" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableaxisconfiguration/AbstractAxisConfiguration/displayLabel"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_k0bfwZewEeKr0Yypv4rfLA"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_k0bfwpewEeKr0Yypv4rfLA" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableaxisconfiguration/AbstractAxisConfiguration/displayFilter"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_k0bfw5ewEeKr0Yypv4rfLA"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_k0bfvpewEeKr0Yypv4rfLA" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableaxisconfiguration/AbstractAxisConfiguration/displayIndex"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_k0bfv5ewEeKr0Yypv4rfLA"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_kk9gVZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_kk9gVpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kk9gV5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_kk9gWJewEeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_kk9gWZewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_kk9gWpewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kk9gW5ewEeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_kk9gUZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AbstractAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kk9gUpewEeKr0Yypv4rfLA" x="35" y="120" width="438"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_lGuwoJewEeKr0Yypv4rfLA" type="1005">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lHBrkJewEeKr0Yypv4rfLA" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lHBrkZewEeKr0Yypv4rfLA" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_lG4hoJewEeKr0Yypv4rfLA" type="4010"/>
-    <children xmi:type="notation:Node" xmi:id="_lG4hoZewEeKr0Yypv4rfLA" type="5008">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lG4hopewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_lG4ho5ewEeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lG4hpJewEeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_lGuwoZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lGuwopewEeKr0Yypv4rfLA" x="205" y="25"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_SU3DIKEeEeKEtanfuQnMXQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_SU3DI6EeEeKEtanfuQnMXQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_SU3DJKEeEeKEtanfuQnMXQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_SU3DJaEeEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_SU3DJqEeEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_SU3DJ6EeEeKEtanfuQnMXQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_SU3DKKEeEeKEtanfuQnMXQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_SU3DKaEeEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_SU3DKqEeEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_SU3DK6EeEeKEtanfuQnMXQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_SU3DIaEeEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//MasterAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SU3DIqEeEeKEtanfuQnMXQ" x="575" y="565" height="78"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_WlRvcKEeEeKEtanfuQnMXQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_WlRvc6EeEeKEtanfuQnMXQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_WlRvdKEeEeKEtanfuQnMXQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_WlRvdaEeEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_WlRvdqEeEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WlRvd6EeEeKEtanfuQnMXQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_WlRveKEeEeKEtanfuQnMXQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_WlRveaEeEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_WlRveqEeEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WlRve6EeEeKEtanfuQnMXQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_WlRvcaEeEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//SlaveAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WlRvcqEeEeKEtanfuQnMXQ" x="1120" y="750"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_JgZHYKEfEeKEtanfuQnMXQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_JgZHY6EfEeKEtanfuQnMXQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_JgZHZKEfEeKEtanfuQnMXQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_JgZHZaEfEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_JgZHZqEfEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_JgZHZ6EfEeKEtanfuQnMXQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_JgZHaKEfEeKEtanfuQnMXQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_JgZHaaEfEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_JgZHaqEfEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_JgZHa6EfEeKEtanfuQnMXQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_JgZHYaEfEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//TableAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JgZHYqEfEeKEtanfuQnMXQ" x="1110" y="15" width="248" height="133"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_TnalQKEgEeKEtanfuQnMXQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_TnalQ6EgEeKEtanfuQnMXQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_TnalRKEgEeKEtanfuQnMXQ" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_TNRjwKEcEeKEtanfuQnMXQ" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//AxisManager/javaAxisManagerId"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TNRjwaEcEeKEtanfuQnMXQ"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_TnalRaEgEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_TnalRqEgEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TnalR6EgEeKEtanfuQnMXQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_TnalSKEgEeKEtanfuQnMXQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_TnalSaEgEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_TnalSqEgEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TnalS6EgEeKEtanfuQnMXQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_TnalQaEgEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//AxisManager"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TnalQqEgEeKEtanfuQnMXQ" x="40" y="325" width="216" height="129"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_O4oQAKEiEeKEtanfuQnMXQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_O4oQA6EiEeKEtanfuQnMXQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_O4oQBKEiEeKEtanfuQnMXQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_O4oQBaEiEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_O4oQBqEiEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_O4oQB6EiEeKEtanfuQnMXQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_O4oQCKEiEeKEtanfuQnMXQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_O4oQCaEiEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_O4oQCqEiEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_O4oQC6EiEeKEtanfuQnMXQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_O4oQAaEiEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//SynchronizedAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O4oQAqEiEeKEtanfuQnMXQ" x="605" y="490" width="223"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_SvmhkKEiEeKEtanfuQnMXQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_Svmhk6EiEeKEtanfuQnMXQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_SvmhlKEiEeKEtanfuQnMXQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_SvmhlaEiEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_SvmhlqEiEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Svmhl6EiEeKEtanfuQnMXQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_SvmhmKEiEeKEtanfuQnMXQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_SvmhmaEiEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_SvmhmqEiEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Svmhm6EiEeKEtanfuQnMXQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_SvmhkaEiEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//AxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SvmhkqEiEeKEtanfuQnMXQ" x="690" y="345" width="493" height="55"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EI8A4KEnEeKEtanfuQnMXQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_EI8A46EnEeKEtanfuQnMXQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EI8A5KEnEeKEtanfuQnMXQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EI8A5aEnEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EI8A5qEnEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EI8A56EnEeKEtanfuQnMXQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EI8A6KEnEeKEtanfuQnMXQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EI8A6aEnEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EI8A6qEnEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EI8A66EnEeKEtanfuQnMXQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EI8A4aEnEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//FeatureAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EI8A4qEnEeKEtanfuQnMXQ" x="1090" y="1145" width="173" height="53"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_HYfGEKEnEeKEtanfuQnMXQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_HYfGE6EnEeKEtanfuQnMXQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_HYfGFKEnEeKEtanfuQnMXQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_HYfGFaEnEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_HYfGFqEnEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_HYfGF6EnEeKEtanfuQnMXQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_HYfGGKEnEeKEtanfuQnMXQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_HYfGGaEnEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_HYfGGqEnEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_HYfGG6EnEeKEtanfuQnMXQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_HYfGEaEnEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//ObjectAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HYfGEqEnEeKEtanfuQnMXQ" x="720" y="840" width="179"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_5ILMsKEnEeKEtanfuQnMXQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_5ILMs6EnEeKEtanfuQnMXQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_5ILMtKEnEeKEtanfuQnMXQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_5ILMtaEnEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_5ILMtqEnEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_5ILMt6EnEeKEtanfuQnMXQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_5ILMuKEnEeKEtanfuQnMXQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_5ILMuaEnEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_5ILMuqEnEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_5ILMu6EnEeKEtanfuQnMXQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_5ILMsaEnEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//FeatureIdAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5ILMsqEnEeKEtanfuQnMXQ" x="945" y="955" width="133" height="53"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_AKOTIKEoEeKEtanfuQnMXQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_AKOTI6EoEeKEtanfuQnMXQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_AKOTJKEoEeKEtanfuQnMXQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_AKOTJaEoEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_AKOTJqEoEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_AKOTJ6EoEeKEtanfuQnMXQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_AKOTKKEoEeKEtanfuQnMXQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_AKOTKaEoEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_AKOTKqEoEeKEtanfuQnMXQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_AKOTK6EoEeKEtanfuQnMXQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_AKOTIaEoEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//EMFFeatureAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AKOTIqEoEeKEtanfuQnMXQ" x="510" y="1120"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_Q5HsYKG3EeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Q6BEQKG3EeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Q6BEQaG3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_Q5HsY6G3EeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_Q5HsZKG3EeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Q5HsZaG3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Q5HsZqG3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Q5HsZ6G3EeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Q5HsaKG3EeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Q5HsaaG3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Q5HsaqG3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Q5Hsa6G3EeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Q5HsYaG3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q5HsYqG3EeKNUa7kbzEWsw" x="485" y="665"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_v4txEKG3EeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_v4txE6G3EeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_v4txFKG3EeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_v4txFaG3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_v4txFqG3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_v4txF6G3EeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_v427AKG3EeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_v427AaG3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_v427AqG3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_v427A6G3EeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_v4txEaG3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//ObjectIdAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v4txEqG3EeKNUa7kbzEWsw" x="875" y="1050"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_YhSFsKG5EeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_YhSFs6G5EeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_YhSFtKG5EeKNUa7kbzEWsw" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_abuZIKG5EeKNUa7kbzEWsw" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//AxisManagerConfiguration/javaAxisManagerId"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_abuZIaG5EeKNUa7kbzEWsw"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_YhSFtaG5EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_YhSFtqG5EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_YhSFt6G5EeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_YhSFuKG5EeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_YhSFuaG5EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_YhSFuqG5EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_YhSFu6G5EeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_YhSFsaG5EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//AxisManagerConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YhSFsqG5EeKNUa7kbzEWsw" x="415" y="345" width="193" height="68"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_NFWYcKG6EeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_NFWYc6G6EeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_NFWYdKG6EeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_NFWYdaG6EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_NFWYdqG6EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NFWYd6G6EeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_NFWYeKG6EeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_NFWYeaG6EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_NFWYeqG6EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NFWYe6G6EeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_NFWYcaG6EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//LocalTableAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NFWYcqG6EeKNUa7kbzEWsw" x="975" y="165" width="248" height="78"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_nuBDsKG7EeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_nuBDs6G7EeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_nuBDtKG7EeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_nuBDtaG7EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_nuBDtqG7EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_nuBDt6G7EeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_nuBDuKG7EeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_nuBDuaG7EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_nuBDuqG7EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_nuBDu6G7EeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_nuBDsaG7EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//FeatureAxisManager"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nuBDsqG7EeKNUa7kbzEWsw" x="255" y="255"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_Su7lMKG8EeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_Su7lM6G8EeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_Su7lNKG8EeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Su7lNaG8EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Su7lNqG8EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Su7lN6G8EeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Su7lOKG8EeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Su7lOaG8EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Su7lOqG8EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Su7lO6G8EeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Su7lMaG8EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//FeatureAxisManagerConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Su7lMqG8EeKNUa7kbzEWsw" x="511" y="238"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>
-  <element xmi:type="ecore:EPackage" href="nattable.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_XnaEwJewEeKr0Yypv4rfLA" type="3003" source="_Xmqd4JewEeKr0Yypv4rfLA" target="_XW48gJewEeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_XnaEwZewEeKr0Yypv4rfLA" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_XnaEwpewEeKr0Yypv4rfLA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XnaEw5ewEeKr0Yypv4rfLA" points="[1, 0, -596, -122]$[505, 103, -92, -19]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zRjXkKEnEeKEtanfuQnMXQ" id="(0.8602150537634409,0.9705882352941176)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_X9uTDJewEeKr0Yypv4rfLA" type="3003" source="_X9uTAJewEeKr0Yypv4rfLA" target="_HYfGEKEnEeKEtanfuQnMXQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_X9uTDZewEeKr0Yypv4rfLA" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_X9uTDpewEeKr0Yypv4rfLA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_X9uTD5ewEeKr0Yypv4rfLA" points="[-35, -25, 7, 252]$[-35, -145, 7, 132]$[-42, -145, 0, 132]$[-42, -271, 0, 6]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_10OtQKG3EeKNUa7kbzEWsw" id="(0.29608938547486036,0.9767441860465116)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_b8RMMJewEeKr0Yypv4rfLA" type="3003" source="_WQhxYJewEeKr0Yypv4rfLA" target="_b7-RQJewEeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_b8RMMZewEeKr0Yypv4rfLA" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_b8RMMpewEeKr0Yypv4rfLA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_b8RMM5ewEeKr0Yypv4rfLA" points="[0, -4, 45, 620]$[0, -662, 45, -38]$[-28, -662, 17, -38]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3tIngKEmEeKEtanfuQnMXQ" id="(0.7068965517241379,0.02403846153846154)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3XHUMKEmEeKEtanfuQnMXQ" id="(0.8975903614457831,0.9647058823529412)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_dKO0LZewEeKr0Yypv4rfLA" type="3003" source="_dKFDIJewEeKr0Yypv4rfLA" target="_b7-RQJewEeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_dKO0LpewEeKr0Yypv4rfLA" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_dKO0L5ewEeKr0Yypv4rfLA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dKO0MJewEeKr0Yypv4rfLA" points="[-11, -19, 6, 257]$[-11, -109, 6, 167]$[-16, -109, 1, 167]$[-16, -274, 1, 2]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q7FhQJexEeKr0Yypv4rfLA" id="(0.7669172932330827,0.0784313725490196)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QOdEwJexEeKr0Yypv4rfLA" id="(0.2694300518134715,0.9411764705882353)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_dKO0MZewEeKr0Yypv4rfLA" type="3002" source="_WQhxYJewEeKr0Yypv4rfLA" target="_dKFDIJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_dKO0NZewEeKr0Yypv4rfLA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_dKO0NpewEeKr0Yypv4rfLA" x="-46" y="-21"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_dKO0N5ewEeKr0Yypv4rfLA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_dKO0OJewEeKr0Yypv4rfLA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_dKO0MpewEeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_dKO0M5ewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/tableConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dKO0NJewEeKr0Yypv4rfLA" points="[-37, -103, 159, 456]$[-196, -558, 0, 1]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oS5VMJexEeKr0Yypv4rfLA" id="(0.5948275862068966,0.057692307692307696)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_70A9UKEmEeKEtanfuQnMXQ" id="(0.8571428571428571,0.9803921568627451)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_i5jHYJewEeKr0Yypv4rfLA" type="3003" source="_i5ZWYJewEeKr0Yypv4rfLA" target="_SU3DIKEeEeKEtanfuQnMXQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_i5jHYZewEeKr0Yypv4rfLA" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_i5jHYpewEeKr0Yypv4rfLA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i5jHY5ewEeKr0Yypv4rfLA" points="[87, -45, -323, 127]$[87, -138, -323, 34]$[307, -138, -103, 34]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_kH80MJewEeKr0Yypv4rfLA" type="3003" source="_kHzDMJewEeKr0Yypv4rfLA" target="_jpJ_YJewEeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_kH80MZewEeKr0Yypv4rfLA" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_kH80MpewEeKr0Yypv4rfLA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kH80M5ewEeKr0Yypv4rfLA" points="[0, 1, -214, -405]$[196, 373, -18, -33]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_kH80NJewEeKr0Yypv4rfLA" type="3003" source="_j3SiAJewEeKr0Yypv4rfLA" target="_kHzDMJewEeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_kH80NZewEeKr0Yypv4rfLA" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_kH80NpewEeKr0Yypv4rfLA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kH80N5ewEeKr0Yypv4rfLA" points="[-17, -58, 150, 529]$[-167, -586, 0, 1]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_klHRUJewEeKr0Yypv4rfLA" type="3002" source="_TnalQKEgEeKEtanfuQnMXQ" target="_jpJ_YJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_klHRVJewEeKr0Yypv4rfLA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_klHRVZewEeKr0Yypv4rfLA" x="-79" y="-57"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_klHRVpewEeKr0Yypv4rfLA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_klHRV5ewEeKr0Yypv4rfLA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_klHRUZewEeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_klHRUpewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//AxisManager/labelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_klHRU5ewEeKr0Yypv4rfLA" points="[0, 1, -214, -405]$[196, 373, -18, -33]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_r0InUJexEeKr0Yypv4rfLA" id="(0.4861111111111111,0.9844961240310077)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_5bxfIKEcEeKEtanfuQnMXQ" type="3002" source="_WQhxYJewEeKr0Yypv4rfLA" target="_ibpDYJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_5bxfJKEcEeKEtanfuQnMXQ" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_5bxfJaEcEeKEtanfuQnMXQ" x="-114" y="106"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_5bxfJqEcEeKEtanfuQnMXQ" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_5bxfJ6EcEeKEtanfuQnMXQ" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_5bxfIaEcEeKEtanfuQnMXQ" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_5bxfIqEcEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/columnAxisProvidersHistory"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5bxfI6EcEeKEtanfuQnMXQ" points="[-16, -8, 531, 777]$[-547, -8, 0, 777]$[-547, -752, 0, 33]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5b6pEKEcEeKEtanfuQnMXQ" id="(0.07327586206896551,0.6971153846153846)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_6KCTUKEcEeKEtanfuQnMXQ" type="3002" source="_WQhxYJewEeKr0Yypv4rfLA" target="_ibpDYJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_6KCTVKEcEeKEtanfuQnMXQ" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6KCTVaEcEeKEtanfuQnMXQ" x="-501" y="244"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_6KCTVqEcEeKEtanfuQnMXQ" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6KCTV6EcEeKEtanfuQnMXQ" x="-496" y="127"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_6KCTUaEcEeKEtanfuQnMXQ" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_6KCTUqEcEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/rowAxisProvidersHistory"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6KCTU6EcEeKEtanfuQnMXQ" points="[-15, 6, 462, 710]$[-500, 6, -23, 710]$[-477, -703, 0, 1]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6KCTWKEcEeKEtanfuQnMXQ" id="(0.06896551724137931,0.4567307692307692)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6KCTWaEcEeKEtanfuQnMXQ" id="(0.7018633540372671,0.9411764705882353)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_n2OdYKEfEeKEtanfuQnMXQ" type="3003" source="_JgZHYKEfEeKEtanfuQnMXQ" target="_kk9gUJewEeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_n2OdYaEfEeKEtanfuQnMXQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_n2OdYqEfEeKEtanfuQnMXQ" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_n2OdY6EfEeKEtanfuQnMXQ" points="[-123, 9, 741, -52]$[-979, 9, -115, -52]$[-979, 40, -115, -21]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n2OdZKEfEeKEtanfuQnMXQ" id="(0.7671232876712328,0.18333333333333332)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EyDeEKEhEeKEtanfuQnMXQ" type="3002" source="_dKFDIJewEeKr0Yypv4rfLA" target="_ibpDYJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_EyDeFKEhEeKEtanfuQnMXQ" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EyDeFaEhEeKEtanfuQnMXQ" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EyDeFqEhEeKEtanfuQnMXQ" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EyDeF6EhEeKEtanfuQnMXQ" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EyDeEaEhEeKEtanfuQnMXQ" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EyDeEqEhEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/columnAxisProviders"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EyDeE6EhEeKEtanfuQnMXQ" points="[-47, -19, 831, 294]$[-798, -338, 80, -25]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EyNPEKEhEeKEtanfuQnMXQ" id="(0.18045112781954886,0.46078431372549017)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_GMzk0KEhEeKEtanfuQnMXQ" type="3002" source="_dKFDIJewEeKr0Yypv4rfLA" target="_ibpDYJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_GMzk1KEhEeKEtanfuQnMXQ" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_GMzk1aEhEeKEtanfuQnMXQ" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_GMzk1qEhEeKEtanfuQnMXQ" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_GMzk16EhEeKEtanfuQnMXQ" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_GMzk0aEhEeKEtanfuQnMXQ" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_GMzk0qEhEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/rowAxisProviders"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GMzk06EhEeKEtanfuQnMXQ" points="[-132, -19, 549, -27]$[-142, -20, 539, -28]$[-618, 5, 63, -3]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GMzk2KEhEeKEtanfuQnMXQ" id="(0.6086956521739131,0.20588235294117646)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_V5C-wKEiEeKEtanfuQnMXQ" type="3002" source="_SvmhkKEiEeKEtanfuQnMXQ" target="_XW48gJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_V5MIsKEiEeKEtanfuQnMXQ" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_V5MIsaEiEeKEtanfuQnMXQ" x="22" y="-22"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_V5MIsqEiEeKEtanfuQnMXQ" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_V5MIs6EiEeKEtanfuQnMXQ" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_V5C-waEiEeKEtanfuQnMXQ" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_V5C-wqEiEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//AxisProvider/axis"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_V5C-w6EiEeKEtanfuQnMXQ" points="[-8, 27, 94, -322]$[-98, 334, 4, -15]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9PlPEKG4EeKNUa7kbzEWsw" id="(0.4543610547667343,0.8181818181818182)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WdM0sKEiEeKEtanfuQnMXQ" id="(0.44623655913978494,0.23529411764705882)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_clEx4KEiEeKEtanfuQnMXQ" type="3003" source="_SvmhkKEiEeKEtanfuQnMXQ" target="_ibpDYJewEeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_clEx4aEiEeKEtanfuQnMXQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_clEx4qEiEeKEtanfuQnMXQ" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_clEx46EiEeKEtanfuQnMXQ" points="[39, -12, 16, 59]$[39, -66, 16, 5]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_clEx5KEiEeKEtanfuQnMXQ" id="(0.2961460446247465,0.01818181818181818)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5Of_QKG4EeKNUa7kbzEWsw" id="(0.6273291925465838,0.9264705882352942)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_ddwtYKEiEeKEtanfuQnMXQ" type="3003" source="_O4oQAKEiEeKEtanfuQnMXQ" target="_SvmhkKEiEeKEtanfuQnMXQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ddwtYaEiEeKEtanfuQnMXQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_ddwtYqEiEeKEtanfuQnMXQ" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ddwtY6EiEeKEtanfuQnMXQ" points="[8, -9, -80, 96]$[8, -35, -80, 70]$[51, -35, -37, 70]$[51, -61, -37, 44]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ddwtZKEiEeKEtanfuQnMXQ" id="(0.711764705882353,0.23255813953488372)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4zRb0KG4EeKNUa7kbzEWsw" id="(0.08316430020283976,0.9454545454545454)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_iPMcEKEiEeKEtanfuQnMXQ" type="3002" source="_kk9gUJewEeKr0Yypv4rfLA" target="_jpJ_YJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_iPMcFKEiEeKEtanfuQnMXQ" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_iPMcFaEiEeKEtanfuQnMXQ" x="-66" y="115"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_iPMcFqEiEeKEtanfuQnMXQ" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_iPMcF6EiEeKEtanfuQnMXQ" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_iPMcEaEiEeKEtanfuQnMXQ" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_iPMcEqEiEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AbstractAxisConfiguration/ownedLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iPMcE6EiEeKEtanfuQnMXQ" points="[-16, 7, 394, -154]$[-309, 154, 101, -7]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iPMcGKEiEeKEtanfuQnMXQ" id="(0.15753424657534246,0.8)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4ZeUYKG7EeKNUa7kbzEWsw" id="(0.23353293413173654,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_iM9yAKEjEeKEtanfuQnMXQ" type="3003" source="_WlRvcKEeEeKEtanfuQnMXQ" target="_SvmhkKEiEeKEtanfuQnMXQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_iM9yAaEjEeKEtanfuQnMXQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_iM9yAqEjEeKEtanfuQnMXQ" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iM9yA6EjEeKEtanfuQnMXQ" points="[-15, -3, 14, 354]$[-15, -355, 14, 2]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BBezYKG5EeKNUa7kbzEWsw" id="(0.1951219512195122,0.09302325581395349)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hLH7QKG3EeKNUa7kbzEWsw" id="(0.8650793650793651,0.9636363636363636)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_bJYdsKEnEeKEtanfuQnMXQ" type="3002" source="_EI8A4KEnEeKEtanfuQnMXQ" target="_j3SiAJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_bJYdtKEnEeKEtanfuQnMXQ" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bJYdtaEnEeKEtanfuQnMXQ" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_bJYdtqEnEeKEtanfuQnMXQ" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bJYdt6EnEeKEtanfuQnMXQ" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_bJYdsaEnEeKEtanfuQnMXQ" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_bJYdsqEnEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//FeatureAxis/localLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bJYds6EnEeKEtanfuQnMXQ" points="[-53, 4, 879, -74]$[-930, 34, 2, -44]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bJiOsKEnEeKEtanfuQnMXQ" id="(0.31213872832369943,0.8113207547169812)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bJiOsaEnEeKEtanfuQnMXQ" id="(0.8392857142857143,0.37815126050420167)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_eKDZYKEnEeKEtanfuQnMXQ" type="3002" source="_HYfGEKEnEeKEtanfuQnMXQ" target="_kHzDMJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_eKDZZKEnEeKEtanfuQnMXQ" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_eKDZZaEnEeKEtanfuQnMXQ" x="-50" y="-28"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_eKDZZqEnEeKEtanfuQnMXQ" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_eKDZZ6EnEeKEtanfuQnMXQ" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_eKDZYaEnEeKEtanfuQnMXQ" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_eKDZYqEnEeKEtanfuQnMXQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//ObjectAxis/localLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eKDZY6EnEeKEtanfuQnMXQ" points="[-6, 16, 562, -83]$[-6, 99, 562, 0]$[-459, 99, 109, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sdBvwKEnEeKEtanfuQnMXQ" id="(0.0670391061452514,0.627906976744186)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_-Ovd4KEnEeKEtanfuQnMXQ" type="3003" source="_5ILMsKEnEeKEtanfuQnMXQ" target="_Xmqd4JewEeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_-Ovd4aEnEeKEtanfuQnMXQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_-Ovd4qEnEeKEtanfuQnMXQ" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-Ovd46EnEeKEtanfuQnMXQ" points="[1, -25, -8, 191]$[11, -235, 2, -19]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-Ovd5KEnEeKEtanfuQnMXQ" id="(0.5116279069767442,0.9411764705882353)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="__N0VQKEnEeKEtanfuQnMXQ" type="3003" source="_5ILMsKEnEeKEtanfuQnMXQ" target="_EI8A4KEnEeKEtanfuQnMXQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="__N0VQaEnEeKEtanfuQnMXQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="__N0VQqEnEeKEtanfuQnMXQ" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__N0VQ6EnEeKEtanfuQnMXQ" points="[66, 1, -99, -189]$[95, 1, -70, -189]$[95, 165, -70, -25]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_HqeYgKEoEeKEtanfuQnMXQ" type="3003" source="_AKOTIKEoEeKEtanfuQnMXQ" target="_EI8A4KEnEeKEtanfuQnMXQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_HqeYgaEoEeKEtanfuQnMXQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_HqeYgqEoEeKEtanfuQnMXQ" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HqeYg6EoEeKEtanfuQnMXQ" points="[8, -20, 4, 79]$[8, -73, 4, 26]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_SWDr0KG0EeKNUa7kbzEWsw" type="3003" source="_HYfGEKEnEeKEtanfuQnMXQ" target="_XW48gJewEeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_SWDr0aG0EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_SWDr0qG0EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SWDr06G0EeKNUa7kbzEWsw" points="[-12, -15, 1, 174]$[-12, -174, 1, 15]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SWNc0KG0EeKNUa7kbzEWsw" id="(0.7541899441340782,0.37209302325581395)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SWNc0aG0EeKNUa7kbzEWsw" id="(0.22525597269624573,0.7794117647058824)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_8t2iYKG1EeKNUa7kbzEWsw" type="3003" source="_EI8A4KEnEeKEtanfuQnMXQ" target="_WlRvcKEeEeKEtanfuQnMXQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_8t2iYaG1EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_8t2iYqG1EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8t2iY6G1EeKNUa7kbzEWsw" points="[-2, -8, 29, 420]$[30, -431, 61, -3]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8t2iZKG1EeKNUa7kbzEWsw" id="(0.5086705202312138,0.16981132075471697)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Q5kYUKG3EeKNUa7kbzEWsw" type="3002" source="_AKOTIKEoEeKEtanfuQnMXQ" target="_Q5HsYKG3EeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_Q5kYVKG3EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Q5kYVaG3EeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Q5kYVqG3EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Q5kYV6G3EeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Q5kYUaG3EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Q5kYUqG3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//EMFFeatureAxis/element"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q5kYU6G3EeKNUa7kbzEWsw" points="[-19, -20, 1132, 1266]$[-1150, -1285, 1, 1]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Q5tiSKG3EeKNUa7kbzEWsw" type="3002" source="_i5ZWYJewEeKr0Yypv4rfLA" target="_Q5HsYKG3EeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_Q5tiTKG3EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Q5tiTaG3EeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Q5tiTqG3EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Q5tiT6G3EeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Q5tiSaG3EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Q5tiSqG3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/EMFFeatureValueAxisProvider/listenFeature"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q5tiS6G3EeKNUa7kbzEWsw" points="[-19, -45, 270, 676]$[-289, -720, 0, 1]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_XSiskKG3EeKNUa7kbzEWsw" type="3002" source="_SU3DIKEeEeKEtanfuQnMXQ" target="_Q5HsYKG3EeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_XSislKG3EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_XSislaG3EeKNUa7kbzEWsw" x="-20" y="-119"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_XSsdkKG3EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_XSsdkaG3EeKNUa7kbzEWsw" x="-20" y="27"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_XSiskaG3EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_XSiskqG3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//MasterAxisProvider/pastedElementContainmentFeature"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XSisk6G3EeKNUa7kbzEWsw" points="[77, 15, -801, -158]$[879, 150, 1, -23]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XSsdkqG3EeKNUa7kbzEWsw" id="(0.32211538461538464,0.8461538461538461)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XSsdk6G3EeKNUa7kbzEWsw" id="(0.8709677419354839,0.06153846153846154)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_ydZ7YKG3EeKNUa7kbzEWsw" type="3003" source="_v4txEKG3EeKNUa7kbzEWsw" target="_Xmqd4JewEeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ydZ7YaG3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_ydZ7YqG3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ydZ7Y6G3EeKNUa7kbzEWsw" points="[10, -20, -5, 191]$[10, -186, -5, 25]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ydZ7ZKG3EeKNUa7kbzEWsw" id="(0.10077519379844961,0.49019607843137253)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_zlHKUKG3EeKNUa7kbzEWsw" type="3003" source="_v4txEKG3EeKNUa7kbzEWsw" target="_HYfGEKEnEeKEtanfuQnMXQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zlHKUaG3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zlHKUqG3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zlHKU6G3EeKNUa7kbzEWsw" points="[-50, 1, 32, 98]$[-70, 1, 12, 98]$[-70, -79, 12, 18]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zlHKVKG3EeKNUa7kbzEWsw" id="(0.9553072625698324,0.9534883720930233)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_PQaMsKG4EeKNUa7kbzEWsw" type="3003" source="_i5ZWYJewEeKr0Yypv4rfLA" target="_O4oQAKEiEeKEtanfuQnMXQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_PQaMsaG4EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_PQaMsqG4EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PQaMs6G4EeKNUa7kbzEWsw" points="[31, -1, -241, 230]$[31, -191, -241, 40]$[352, -191, 80, 40]$[352, -205, 80, 26]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PQaMtKG4EeKNUa7kbzEWsw" id="(0.7019230769230769,0.021505376344086023)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PQaMtaG4EeKNUa7kbzEWsw" id="(0.14349775784753363,0.37209302325581395)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_lnji8KG6EeKNUa7kbzEWsw" type="3002" source="_YhSFsKG5EeKNUa7kbzEWsw" target="_jpJ_YJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_lnji9KG6EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lnji9aG6EeKNUa7kbzEWsw" x="-176" y="-61"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_lnji9qG6EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lnji96G6EeKNUa7kbzEWsw" x="-56" y="-53"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_lnji8aG6EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_lnji8qG6EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//AxisManagerConfiguration/localLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lnji86G6EeKNUa7kbzEWsw" points="[-29, 20, 628, -416]$[-574, 431, 83, -5]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lnji-KG6EeKNUa7kbzEWsw" id="(0.15544041450777202,0.6617647058823529)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_xGrRoKG6EeKNUa7kbzEWsw" type="3003" source="_NFWYcKG6EeKNUa7kbzEWsw" target="_kk9gUJewEeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xGrRoaG6EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xGrRoqG6EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xGrRo6G6EeKNUa7kbzEWsw" points="[-52, 34, 600, -6]$[-556, 34, 96, -6]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xGrRpKG6EeKNUa7kbzEWsw" id="(0.21370967741935484,0.1282051282051282)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xGrRpaG6EeKNUa7kbzEWsw" id="(0.7808219178082192,0.8067226890756303)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_vPvvwKG7EeKNUa7kbzEWsw" type="3003" source="_nuBDsKG7EeKNUa7kbzEWsw" target="_TnalQKEgEeKEtanfuQnMXQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_vPvvwaG7EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_vPvvwqG7EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vPvvw6G7EeKNUa7kbzEWsw" points="[-27, 5, 63, 1]$[-88, -46, 2, -50]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vPvvxKG7EeKNUa7kbzEWsw" id="(0.15135135135135136,0.5490196078431373)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vPvvxaG7EeKNUa7kbzEWsw" id="(0.9212962962962963,0.3953488372093023)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_YiuIwKG8EeKNUa7kbzEWsw" type="3003" source="_Su7lMKG8EeKNUa7kbzEWsw" target="_YhSFsKG5EeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_YiuIwaG8EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_YiuIwqG8EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YiuIw6G8EeKNUa7kbzEWsw" points="[-27, 25, 83, -91]$[-114, 83, -4, -33]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_VTEgcKG9EeKNUa7kbzEWsw" type="3003" source="_ibpDYJewEeKr0Yypv4rfLA" target="_b7-RQJewEeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VTEgcaG9EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_VTEgcqG9EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VTEgc6G9EeKNUa7kbzEWsw" points="[27, -12, -744, 354]$[772, -387, 1, -21]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VTEgdKG9EeKNUa7kbzEWsw" id="(0.5217391304347826,0.19117647058823528)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VTEgdaG9EeKNUa7kbzEWsw" id="(0.22797927461139897,0.25882352941176473)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KjlNAKG_EeKNUa7kbzEWsw" type="3002" source="_dKFDIJewEeKr0Yypv4rfLA" target="_ibpDYJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_KjlNBKG_EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KjlNBaG_EeKNUa7kbzEWsw" x="-227" y="-26"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KjlNBqG_EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KjlNB6G_EeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KjlNAaG_EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KjlNAqG_EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/defaultRowAxisProvider"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KjlNA6G_EeKNUa7kbzEWsw" points="[-25, -1, 521, 15]$[-544, -7, 2, 9]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KjlNCKG_EeKNUa7kbzEWsw" id="(0.09774436090225563,0.6741573033707865)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KjlNCaG_EeKNUa7kbzEWsw" id="(0.782608695652174,0.8676470588235294)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Pf4H4KG_EeKNUa7kbzEWsw" type="3002" source="_dKFDIJewEeKr0Yypv4rfLA" target="_ibpDYJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_Pf4H5KG_EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Pf4H5aG_EeKNUa7kbzEWsw" x="-29" y="-38"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Pf4H5qG_EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Pf4H56G_EeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Pf4H4aG_EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Pf4H4qG_EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/defaultColumnAxisProvider"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Pf4H46G_EeKNUa7kbzEWsw" points="[-42, -3, 515, 35]$[-555, -18, 2, 20]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Pf4H6KG_EeKNUa7kbzEWsw" id="(0.16165413533834586,0.7359550561797753)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Pf4H6aG_EeKNUa7kbzEWsw" id="(0.8198757763975155,0.7058823529411765)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_hIyfUKG_EeKNUa7kbzEWsw" type="3002" source="_WQhxYJewEeKr0Yypv4rfLA" target="_ibpDYJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_hIyfVKG_EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hIyfVaG_EeKNUa7kbzEWsw" x="1" y="-86"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_hIyfVqG_EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hIyfV6G_EeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hIyfUaG_EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_hIyfUqG_EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/currentRowAxisProvider"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hIyfU6G_EeKNUa7kbzEWsw" points="[-4, 0, 603, 806]$[-599, 0, 8, 806]$[-599, -796, 8, 10]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hIyfWKG_EeKNUa7kbzEWsw" id="(0.021551724137931036,0.9086538461538461)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hIyfWaG_EeKNUa7kbzEWsw" id="(0.049689440993788817,0.8529411764705882)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_kxLiUKG_EeKNUa7kbzEWsw" type="3002" source="_WQhxYJewEeKr0Yypv4rfLA" target="_ibpDYJewEeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_kxLiVKG_EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_kxLiVaG_EeKNUa7kbzEWsw" x="-44" y="-6"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_kxLiVqG_EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_kxLiV6G_EeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_kxLiUaG_EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_kxLiUqG_EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/currentColumnAxisManager"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kxLiU6G_EeKNUa7kbzEWsw" points="[-54, 1, 577, 778]$[-604, 11, 27, 788]$[-630, -758, 1, 19]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kxVTUKG_EeKNUa7kbzEWsw" id="(0.034482758620689655,0.8461538461538461)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kxVTUaG_EeKNUa7kbzEWsw" id="(0.2111801242236025,0.7205882352941176)"/>
-  </edges>
-</notation:Diagram>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/lastRemiVersion/nattableConfiguration.ecorediag b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/lastRemiVersion/nattableConfiguration.ecorediag
deleted file mode 100644
index 1879e7dc770..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/lastRemiVersion/nattableConfiguration.ecorediag
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattable.ecorediag" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_eL98iaHUEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eOym4KHUEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eOym4aHUEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_eL98jKHUEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_eL98jaHUEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_eL98jqHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_eL98j6HUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_eL98kKHUEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_eL98kaHUEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_eL98kqHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_eL98k6HUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_eL98lKHUEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_eL98iqHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/TableConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eL98i6HUEeKNUa7kbzEWsw" x="1070" y="20"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_ePGI0KHUEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_ePGI06HUEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_ePGI1KHUEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ePGI1aHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ePGI1qHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ePGI16HUEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_ePGI2KHUEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ePGI2aHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ePGI2qHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ePGI26HUEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ePGI0aHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//FeatureAxisManager"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ePGI0qHUEeKNUa7kbzEWsw" x="315" y="160"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_ePGI6KHUEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_ePGI66HUEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_ePGI7KHUEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ePGI7aHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ePGI7qHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ePGI76HUEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_ePGI8KHUEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ePGI8aHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ePGI8qHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ePGI86HUEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ePGI6aHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//TableAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ePGI6qHUEeKNUa7kbzEWsw" x="745" y="10" height="128"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_ePPS4aHUEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_ePPS5KHUEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_ePPS5aHUEeKNUa7kbzEWsw" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_ePr-sKHUEeKNUa7kbzEWsw" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//AxisManager/javaAxisManagerId"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ePr-saHUEeKNUa7kbzEWsw"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ePPS5qHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ePPS56HUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ePPS6KHUEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_ePPS6aHUEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ePPS6qHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ePPS66HUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ePPS7KHUEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ePPS4qHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//AxisManager"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ePPS46HUEeKNUa7kbzEWsw" x="335" y="25"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_ePPS-aHUEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_ePPS_KHUEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_ePPS_aHUEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ePPS_qHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ePPS_6HUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ePPTAKHUEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_ePPTAaHUEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ePPTAqHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ePPTA6HUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ePPTBKHUEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ePPS-qHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//FeatureAxisManagerConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ePPS-6HUEeKNUa7kbzEWsw" x="225" y="425"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_ePZD1KHUEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_ePZD16HUEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_ePZD2KHUEeKNUa7kbzEWsw" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_eP1vsKHUEeKNUa7kbzEWsw" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//AxisManagerConfiguration/javaAxisManagerId"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_eP1vsaHUEeKNUa7kbzEWsw"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ePZD2aHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ePZD2qHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ePZD26HUEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_ePZD3KHUEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ePZD3aHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ePZD3qHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ePZD36HUEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ePZD1aHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//AxisManagerConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ePZD1qHUEeKNUa7kbzEWsw" x="240" y="275"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_ePZD7KHUEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_ePZD76HUEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_ePZD8KHUEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ePZD8aHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ePZD8qHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ePZD86HUEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_ePZD9KHUEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ePZD9aHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ePZD9qHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ePZD96HUEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ePZD7aHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//LocalTableAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ePZD7qHUEeKNUa7kbzEWsw" x="590" y="260" height="63"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_1fSR0KHUEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_1fSR06HUEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_1fSR1KHUEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_1fSR1aHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_1fSR1qHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1fSR16HUEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_1fcC0KHUEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_1fcC0aHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_1fcC0qHUEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1fcC06HUEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_1fSR0aHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//Table"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1fSR0qHUEeKNUa7kbzEWsw" x="1075" y="225" width="283" height="118"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_lmc7cKHVEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lm5nYKHVEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lm5nYaHVEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_lmc7c6HVEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_lmc7dKHVEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lmc7daHVEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_lmc7dqHVEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lmc7d6HVEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_lmc7eKHVEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lmc7eaHVEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_lmc7eqHVEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lmc7e6HVEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_lmc7caHVEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/AbstractLabelConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lmc7cqHVEeKNUa7kbzEWsw" x="10" y="585"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>
-  <element xmi:type="ecore:EPackage" href="nattable.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_eQIqoKHUEeKNUa7kbzEWsw" type="3003" source="_ePGI0KHUEeKNUa7kbzEWsw" target="_ePPS4aHUEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_eQIqoaHUEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_eQIqoqHUEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eQIqo6HUEeKNUa7kbzEWsw" points="[-4, -2, 46, 87]$[-4, -88, 46, 1]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eShQSKHUEeKNUa7kbzEWsw" id="(0.23243243243243245,0.0196078431372549)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eShQSaHUEeKNUa7kbzEWsw" id="(0.18439716312056736,0.9803921568627451)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_eQblkKHUEeKNUa7kbzEWsw" type="3002" source="_ePGI6KHUEeKNUa7kbzEWsw" target="_ePPS4aHUEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_eQbllKHUEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_eQbllaHUEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_eQbllqHUEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_eQbll6HUEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_eQblkaHUEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_eQblkqHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//TableAxisConfiguration/axisManagers"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eQblk6HUEeKNUa7kbzEWsw" points="[0, 0, 91, 77]$[-91, -77, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eShQSqHUEeKNUa7kbzEWsw" id="(0.0641025641025641,0.25)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eShQS6HUEeKNUa7kbzEWsw" id="(0.9361702127659575,0.3137254901960784)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_eQblnKHUEeKNUa7kbzEWsw" type="3002" source="_eL98iaHUEeKNUa7kbzEWsw" target="_ePGI6KHUEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_eQbloKHUEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_eQbloaHUEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_eQbloqHUEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_eQblo6HUEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_eQblnaHUEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_eQblnqHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/rowAxisConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eQbln6HUEeKNUa7kbzEWsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xEKxYKHUEeKNUa7kbzEWsw" id="(0.014035087719298246,0.8333333333333334)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x8ti8KHUEeKNUa7kbzEWsw" id="(0.9166666666666666,0.71875)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_eQblpKHUEeKNUa7kbzEWsw" type="3002" source="_eL98iaHUEeKNUa7kbzEWsw" target="_ePGI6KHUEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_eQblqKHUEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_eQblqaHUEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_eQblqqHUEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_eQblq6HUEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_eQblpaHUEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_eQblpqHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/columnAxisConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eQblp6HUEeKNUa7kbzEWsw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_eQugiKHUEeKNUa7kbzEWsw" type="3003" source="_ePPS-aHUEeKNUa7kbzEWsw" target="_ePZD1KHUEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_eQugiaHUEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_eQugiqHUEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eQugi6HUEeKNUa7kbzEWsw" points="[0, 0, 0, 77]$[0, -77, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eShQWKHUEeKNUa7kbzEWsw" id="(0.6,0.1568627450980392)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eShQWaHUEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_eRCCgKHUEeKNUa7kbzEWsw" type="3002" source="_ePZD7KHUEeKNUa7kbzEWsw" target="_ePZD1KHUEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_eRCChKHUEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_eRCChaHUEeKNUa7kbzEWsw" x="-79" y="-56"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_eRCChqHUEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_eRCCh6HUEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_eRCCgaHUEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_eRCCgqHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//LocalTableAxisConfiguration/axisManagerConfigurations"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eRCCg6HUEeKNUa7kbzEWsw" points="[0, 0, -101, 77]$[101, -77, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eShQUqHUEeKNUa7kbzEWsw" id="(0.043010752688172046,0.4603174603174603)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eShQU6HUEeKNUa7kbzEWsw" id="(0.9265536723163842,0.35294117647058826)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_1fcC1qHUEeKNUa7kbzEWsw" type="3002" source="_1fSR0KHUEeKNUa7kbzEWsw" target="_eL98iaHUEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_1fcC2qHUEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1fcC26HUEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_1fcC3KHUEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1fcC3aHUEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1fcC16HUEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_1fcC2KHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/tableConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1fcC2aHUEeKNUa7kbzEWsw" points="[1, 0, -1271, -71]$[1131, 63, -141, -8]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_1fcC3qHUEeKNUa7kbzEWsw" type="3002" source="_1fSR0KHUEeKNUa7kbzEWsw" target="_ePZD7KHUEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_1fcC4qHUEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1fcC46HUEeKNUa7kbzEWsw" x="-156" y="-14"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_1fcC5KHUEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1fcC5aHUEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1fcC36HUEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_1fcC4KHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/localRowAxisConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1fcC4aHUEeKNUa7kbzEWsw" points="[-8, -1, 538, 30]$[-454, -26, 92, 5]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5xVV0KHUEeKNUa7kbzEWsw" id="(0.03180212014134275,0.788135593220339)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FkgB4KHVEeKNUa7kbzEWsw" id="(0.989247311827957,0.8888888888888888)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_1fcC5qHUEeKNUa7kbzEWsw" type="3002" source="_1fSR0KHUEeKNUa7kbzEWsw" target="_ePZD7KHUEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_1fcC6qHUEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1fcC66HUEeKNUa7kbzEWsw" x="-161" y="17"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_1fcC7KHUEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_1fcC7aHUEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_1fcC56HUEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_1fcC6KHUEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/localColumnAxisConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1fcC6aHUEeKNUa7kbzEWsw" points="[-48, -9, 538, 0]$[-494, -9, 92, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8ZvigKHUEeKNUa7kbzEWsw" id="(0.17314487632508835,0.6016949152542372)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_lmmFYqHVEeKNUa7kbzEWsw" type="3002" source="_ePPS4aHUEeKNUa7kbzEWsw" target="_lmc7cKHVEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_lmmFZqHVEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lmmFZ6HVEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_lmmFaKHVEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lmmFaaHVEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_lmmFY6HVEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_lmmFZKHVEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//AxisManager/labelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lmmFZaHVEeKNUa7kbzEWsw" points="[-69, 0, 293, -541]$[-369, 0, -7, -541]$[-369, 536, -7, -5]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sdLisKHVEeKNUa7kbzEWsw" id="(0.16176470588235295,0.08823529411764706)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_lmmFaqHVEeKNUa7kbzEWsw" type="3002" source="_ePZD1KHUEeKNUa7kbzEWsw" target="_lmc7cKHVEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_lmmFbqHVEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lmmFb6HVEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_lmmFcKHVEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lmmFcaHVEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_lmmFa6HVEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_lmmFbKHVEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//AxisManagerConfiguration/localLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lmmFbaHVEeKNUa7kbzEWsw" points="[-87, 0, 129, -319]$[-216, 0, 0, -319]$[-216, 286, 0, -33]"/>
-  </edges>
-</notation:Diagram>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecore b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecore
deleted file mode 100644
index 594f3e95d82..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecore
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="defaultname" nsURI="http://defaultname/1.0" nsPrefix="defaultname">
-  <eAnnotations source="récupérer en utilisant le catalogue"/>
-  <eAnnotations source="récupérer en utilisant le catalogue" references="#//uml.nattable.generic/vaChercher #//sysml.nattable.allocation/vaChercher"/>
-  <eAnnotations source="fourni la contribution aux menus" references="#//uml.nattable.generic #//sysml.nattable.allocation"/>
-  <eAnnotations source="fourni tout ce qui est dans le catalogue" references="#//futurWizard"/>
-  <eClassifiers xsi:type="ecore:EClass" name="catalogue">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="EReference0" upperBound="-1"
-        eType="#//TableConfig"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TableConfig">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="utilisé par " upperBound="-1"
-        eType="#//EditorPlugins"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UMLNattableConfig">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contribue" upperBound="-1"
-        eType="#//catalogue"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="UMLGenericTableConfig"
-        lowerBound="1" eType="#//TableConfig" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SysMLNattableConfig">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contribue" upperBound="-1"
-        eType="#//catalogue"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="SysMLTableConfig" lowerBound="1"
-        eType="#//TableConfig" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="SysmlAllocationConfig"
-        lowerBound="1" eType="#//TableConfig" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="uml.nattable.generic" eSuperTypes="#//EditorPlugins">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="vaChercher" lowerBound="1"
-        eType="#//catalogue"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="sysml.nattable.allocation" eSuperTypes="#//EditorPlugins">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="vaChercher" lowerBound="1"
-        eType="#//catalogue"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="futurWizard">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="EReference0" lowerBound="1"
-        eType="#//catalogue"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EditorPlugins"/>
-</ecore:EPackage>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecorediag b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecorediag
deleted file mode 100644
index 621d431e91f..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecorediag
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_DYfI0Je6EeKr0Yypv4rfLA" type="EcoreTools" name="DefaultName" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_EHMo8Je6EeKr0Yypv4rfLA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_EHMo85e6EeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EHMo9Je6EeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EHMo9Ze6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EHMo9pe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EHMo95e6EeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EHMo-Je6EeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EHMo-Ze6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EHMo-pe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EHMo-5e6EeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EHMo8Ze6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//catalogue"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EHMo8pe6EeKr0Yypv4rfLA" x="1040" y="270"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_FWDBsJe6EeKr0Yypv4rfLA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_FWDBs5e6EeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_FWDBtJe6EeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_FWDBtZe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_FWDBtpe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_FWDBt5e6EeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_FWDBuJe6EeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_FWDBuZe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_FWDBupe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_FWDBu5e6EeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_FWDBsZe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//TableConfig"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FWDBspe6EeKr0Yypv4rfLA" x="525" y="115" width="160" height="103"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_JRoGcJe6EeKr0Yypv4rfLA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_JRoGc5e6EeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_JRoGdJe6EeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_JRoGdZe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_JRoGdpe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_JRoGd5e6EeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_JRoGeJe6EeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_JRoGeZe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_JRoGepe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_JRoGe5e6EeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_JRoGcZe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//UMLNattableConfig"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JRoGcpe6EeKr0Yypv4rfLA" x="465" y="385" width="228" height="78"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_P--vQJe6EeKr0Yypv4rfLA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_P--vQ5e6EeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_P--vRJe6EeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_P--vRZe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_P--vRpe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_P--vR5e6EeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_P--vSJe6EeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_P--vSZe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_P--vSpe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_P--vS5e6EeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_P--vQZe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//SysMLNattableConfig"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P--vQpe6EeKr0Yypv4rfLA" x="970" y="125" width="198" height="83"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_SzJgAJe6EeKr0Yypv4rfLA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_SzJgA5e6EeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_SzJgBJe6EeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_SzJgBZe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_SzJgBpe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_SzJgB5e6EeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_SzJgCJe6EeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_SzJgCZe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_SzJgCpe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_SzJgC5e6EeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_SzJgAZe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//uml.nattable.generic"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SzJgApe6EeKr0Yypv4rfLA" x="525" y="675" width="181"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_Vgw80Je6EeKr0Yypv4rfLA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_Vgw805e6EeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_Vgw81Je6EeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Vgw81Ze6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Vgw81pe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Vgw815e6EeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Vgw82Je6EeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Vgw82Ze6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Vgw82pe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Vgw825e6EeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Vgw80Ze6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//sysml.nattable.allocation"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vgw80pe6EeKr0Yypv4rfLA" x="895" y="510"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_iQxroJe6EeKr0Yypv4rfLA" type="1003">
-    <children xmi:type="notation:Node" xmi:id="_iQxro5e6EeKr0Yypv4rfLA" type="4007"/>
-    <children xmi:type="notation:Node" xmi:id="_iQxrpJe6EeKr0Yypv4rfLA" type="5007">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_iQxrpZe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_iQxrppe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_iQxrp5e6EeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_iQxroZe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="14668776" lineColor="4210752"/>
-    <element xmi:type="ecore:EAnnotation" href="DefaultName.ecore#//%récupérer%20en%20utilisant%20le%20catalogue%.1"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iQxrope6EeKr0Yypv4rfLA" x="1135" y="465"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_qDTz0Je6EeKr0Yypv4rfLA" type="1003">
-    <children xmi:type="notation:Node" xmi:id="_qDTz05e6EeKr0Yypv4rfLA" type="4007"/>
-    <children xmi:type="notation:Node" xmi:id="_qDTz1Je6EeKr0Yypv4rfLA" type="5007">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_qDTz1Ze6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_qDTz1pe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_qDTz15e6EeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_qDTz0Ze6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="14668776" lineColor="4210752"/>
-    <element xmi:type="ecore:EAnnotation" href="DefaultName.ecore#//%fourni%20la%20contribution%20aux%20menus%"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qDTz0pe6EeKr0Yypv4rfLA" x="790" y="590"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_t2jb8Je6EeKr0Yypv4rfLA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_t2tM8Je6EeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_t2tM8Ze6EeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_t2tM8pe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_t2tM85e6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_t2tM9Je6EeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_t2tM9Ze6EeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_t2tM9pe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_t2tM95e6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_t2tM-Je6EeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_t2jb8Ze6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//futurWizard"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t2jb8pe6EeKr0Yypv4rfLA" x="1235" y="255" width="172"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_yNzwEJe6EeKr0Yypv4rfLA" type="1003">
-    <children xmi:type="notation:Node" xmi:id="_yNzwE5e6EeKr0Yypv4rfLA" type="4007"/>
-    <children xmi:type="notation:Node" xmi:id="_yNzwFJe6EeKr0Yypv4rfLA" type="5007">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_yNzwFZe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_yNzwFpe6EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_yNzwF5e6EeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_yNzwEZe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="14668776" lineColor="4210752"/>
-    <element xmi:type="ecore:EAnnotation" href="DefaultName.ecore#//%fourni%20tout%20ce%20qui%20est%20dans%20le%20catalogue%"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yNzwEpe6EeKr0Yypv4rfLA" x="1560" y="260"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_ETjYAJe8EeKr0Yypv4rfLA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_ETjYA5e8EeKr0Yypv4rfLA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_ETjYBJe8EeKr0Yypv4rfLA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ETjYBZe8EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ETjYBpe8EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ETjYB5e8EeKr0Yypv4rfLA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_ETjYCJe8EeKr0Yypv4rfLA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ETjYCZe8EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ETjYCpe8EeKr0Yypv4rfLA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ETjYC5e8EeKr0Yypv4rfLA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ETjYAZe8EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="DefaultName.ecore#//EditorPlugins"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ETjYApe8EeKr0Yypv4rfLA" x="541" y="522"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_DYfI0Ze6EeKr0Yypv4rfLA"/>
-  <element xmi:type="ecore:EPackage" href="DefaultName.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_HYhPwJe6EeKr0Yypv4rfLA" type="3002" source="_EHMo8Je6EeKr0Yypv4rfLA" target="_FWDBsJe6EeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_HYhPxJe6EeKr0Yypv4rfLA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_HYhPxZe6EeKr0Yypv4rfLA" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_HYhPxpe6EeKr0Yypv4rfLA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_HYhPx5e6EeKr0Yypv4rfLA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_HYhPwZe6EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_HYhPwpe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//catalogue/EReference0"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HYhPw5e6EeKr0Yypv4rfLA" points="[-50, 0, 490, 129]$[-355, 0, 185, 129]$[-461, -74, 79, 55]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HYhPyJe6EeKr0Yypv4rfLA" id="(0.1625,0.4583333333333333)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_UbldcJe6EeKr0Yypv4rfLA" type="3002" source="_SzJgAJe6EeKr0Yypv4rfLA" target="_EHMo8Je6EeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_UblddJe6EeKr0Yypv4rfLA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_UblddZe6EeKr0Yypv4rfLA" x="-139" y="-2"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Ublddpe6EeKr0Yypv4rfLA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ubldd5e6EeKr0Yypv4rfLA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_UbldcZe6EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Ubldcpe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//uml.nattable.generic/vaChercher"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ubldc5e6EeKr0Yypv4rfLA" points="[46, 0, -429, 381]$[1147, 11, 672, 392]$[1147, -283, 672, 98]$[475, -283, 0, 98]$[475, -372, 0, 9]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UbldeJe6EeKr0Yypv4rfLA" id="(0.7458563535911602,0.20930232558139536)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_k3tcMJe7EeKr0Yypv4rfLA" id="(0.9313725490196079,0.7906976744186046)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Xiye8Je6EeKr0Yypv4rfLA" type="3002" source="_Vgw80Je6EeKr0Yypv4rfLA" target="_EHMo8Je6EeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_Xiye9Je6EeKr0Yypv4rfLA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Xiye9Ze6EeKr0Yypv4rfLA" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Xiye9pe6EeKr0Yypv4rfLA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Xiye95e6EeKr0Yypv4rfLA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Xiye8Ze6EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Xiye8pe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//sysml.nattable.allocation/vaChercher"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xiye85e6EeKr0Yypv4rfLA" points="[-4, -16, 92, 409]$[-94, -446, 2, -21]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xiye-Je6EeKr0Yypv4rfLA" id="(0.8098159509202454,0.3953488372093023)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Xiye-Ze6EeKr0Yypv4rfLA" id="(0.4215686274509804,0.8372093023255814)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_kvETAJe6EeKr0Yypv4rfLA" type="3001" source="_iQxroJe6EeKr0Yypv4rfLA" target="_UbldcJe6EeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_kvETAZe6EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_kvETApe6EeKr0Yypv4rfLA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kvETA5e6EeKr0Yypv4rfLA" points="[-49, 18, 279, -102]$[298, -109, 626, -229]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Vw1HMJe8EeKr0Yypv4rfLA" id="(0.9699570815450643,0.4)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kvOEAJe6EeKr0Yypv4rfLA" id="(0.20689655172413793,0.8288508557457213)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_mVSC4Je6EeKr0Yypv4rfLA" type="3001" source="_iQxroJe6EeKr0Yypv4rfLA" target="_Xiye8Je6EeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_mVSC4Ze6EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_mVSC4pe6EeKr0Yypv4rfLA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mVSC45e6EeKr0Yypv4rfLA" points="[115, 13, -550, -67]$[694, 84, 29, 4]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W5R9AJe8EeKr0Yypv4rfLA" id="(0.034334763948497854,0.7)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mVSC5Je6EeKr0Yypv4rfLA" id="(0.8369098712446352,0.8596059113300493)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_sa6kYJe6EeKr0Yypv4rfLA" type="3001" source="_qDTz0Je6EeKr0Yypv4rfLA" target="_SzJgAJe6EeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_sa6kYZe6EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_sa6kYpe6EeKr0Yypv4rfLA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sa6kY5e6EeKr0Yypv4rfLA" points="[-1, -18, 2, 90]$[-1, -116, 2, -8]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sa6kZJe6EeKr0Yypv4rfLA" id="(0.5359116022099447,0.20930232558139536)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_s0NOIJe6EeKr0Yypv4rfLA" type="3001" source="_qDTz0Je6EeKr0Yypv4rfLA" target="_Vgw80Je6EeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_s0NOIZe6EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_s0NOIpe6EeKr0Yypv4rfLA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s0NOI5e6EeKr0Yypv4rfLA" points="[51, -8, -358, 62]$[410, -60, 1, 10]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s0NOJJe6EeKr0Yypv4rfLA" id="(0.7668161434977578,0.575)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_s0NOJZe6EeKr0Yypv4rfLA" id="(0.4539877300613497,0.7674418604651163)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_wsqGYJe6EeKr0Yypv4rfLA" type="3002" source="_t2jb8Je6EeKr0Yypv4rfLA" target="_EHMo8Je6EeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_wsqGZJe6EeKr0Yypv4rfLA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_wsqGZZe6EeKr0Yypv4rfLA" x="-34" y="-56"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_wsqGZpe6EeKr0Yypv4rfLA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_wsqGZ5e6EeKr0Yypv4rfLA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_wsqGYZe6EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_wsqGYpe6EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//futurWizard/EReference0"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wsqGY5e6EeKr0Yypv4rfLA" points="[-19, 21, 91, -99]$[-103, 100, 7, -20]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2XXmcJe6EeKr0Yypv4rfLA" id="(0.9607843137254902,0.37209302325581395)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_01Bp8Je6EeKr0Yypv4rfLA" type="3001" source="_yNzwEJe6EeKr0Yypv4rfLA" target="_t2jb8Je6EeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_01Bp8Ze6EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_01Bp8pe6EeKr0Yypv4rfLA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_01Bp85e6EeKr0Yypv4rfLA" points="[-4, -23, 43, 61]$[21, -63, 68, 21]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_01Bp9Je6EeKr0Yypv4rfLA" id="(0.18631178707224336,0.65)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_d2teoJe7EeKr0Yypv4rfLA" type="3002" source="_P--vQJe6EeKr0Yypv4rfLA" target="_EHMo8Je6EeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_d2tepJe7EeKr0Yypv4rfLA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_d2tepZe7EeKr0Yypv4rfLA" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_d2teppe7EeKr0Yypv4rfLA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_d2tep5e7EeKr0Yypv4rfLA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_d2teoZe7EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_d2teope7EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//SysMLNattableConfig/contribue"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_d2teo5e7EeKr0Yypv4rfLA" points="[1, 8, -9, -103]$[11, 102, 1, -9]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d23PoJe7EeKr0Yypv4rfLA" id="(0.5656565656565656,0.8823529411764706)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_d23PoZe7EeKr0Yypv4rfLA" id="(0.35294117647058826,0.23255813953488372)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_ftI0wJe7EeKr0Yypv4rfLA" type="3002" source="_JRoGcJe6EeKr0Yypv4rfLA" target="_EHMo8Je6EeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_ftI0xJe7EeKr0Yypv4rfLA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ftI0xZe7EeKr0Yypv4rfLA" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_ftI0xpe7EeKr0Yypv4rfLA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ftI0x5e7EeKr0Yypv4rfLA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ftI0wZe7EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_ftI0wpe7EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//UMLNattableConfig/contribue"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ftI0w5e7EeKr0Yypv4rfLA" points="[99, 38, -269, -102]$[369, 122, 1, -18]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ftI0yJe7EeKr0Yypv4rfLA" id="(0.16666666666666666,0.4418604651162791)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_rmZhwJe7EeKr0Yypv4rfLA" type="3002" source="_JRoGcJe6EeKr0Yypv4rfLA" target="_FWDBsJe6EeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_rmjSwJe7EeKr0Yypv4rfLA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_rmjSwZe7EeKr0Yypv4rfLA" x="-92" y="78"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_rmjSwpe7EeKr0Yypv4rfLA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_rmjSw5e7EeKr0Yypv4rfLA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_rmZhwZe7EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_rmZhwpe7EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//UMLNattableConfig/UMLGenericTableConfig"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rmZhw5e7EeKr0Yypv4rfLA" points="[6, 8, -68, -86]$[75, 82, 1, -12]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rmjSxJe7EeKr0Yypv4rfLA" id="(0.37719298245614036,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rmjSxZe7EeKr0Yypv4rfLA" id="(0.175,0.2708333333333333)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_u62VEJe7EeKr0Yypv4rfLA" type="3002" source="_P--vQJe6EeKr0Yypv4rfLA" target="_FWDBsJe6EeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_u62VFJe7EeKr0Yypv4rfLA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_u62VFZe7EeKr0Yypv4rfLA" x="-55" y="-9"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_u62VFpe7EeKr0Yypv4rfLA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_u62VF5e7EeKr0Yypv4rfLA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_u62VEZe7EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_u62VEpe7EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//SysMLNattableConfig/SysMLTableConfig"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_u62VE5e7EeKr0Yypv4rfLA" points="[-37, 21, 222, -137]$[-338, 153, -79, -5]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3AbVEJe7EeKr0Yypv4rfLA" id="(0.015151515151515152,0.23255813953488372)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4rZCEJe7EeKr0Yypv4rfLA" id="(0.9125,0.24271844660194175)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_wEpOsJe7EeKr0Yypv4rfLA" type="3002" source="_P--vQJe6EeKr0Yypv4rfLA" target="_FWDBsJe6EeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_wEpOtJe7EeKr0Yypv4rfLA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_wEpOtZe7EeKr0Yypv4rfLA" x="-56" y="-13"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_wEpOtpe7EeKr0Yypv4rfLA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_wEpOt5e7EeKr0Yypv4rfLA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_wEpOsZe7EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_wEpOspe7EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//SysMLNattableConfig/SysmlAllocationConfig"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wEpOs5e7EeKr0Yypv4rfLA" points="[-29, 21, 230, -137]$[-180, 155, 79, -3]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_FuTewJe8EeKr0Yypv4rfLA" type="3003" source="_SzJgAJe6EeKr0Yypv4rfLA" target="_ETjYAJe8EeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FuTewZe8EeKr0Yypv4rfLA" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_FuTewpe8EeKr0Yypv4rfLA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FuTew5e8EeKr0Yypv4rfLA" points="[-40, -20, 143, 73]$[-177, -72, 6, 21]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_GM9JoJe8EeKr0Yypv4rfLA" type="3003" source="_Vgw80Je6EeKr0Yypv4rfLA" target="_ETjYAJe8EeKr0Yypv4rfLA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_GM9JoZe8EeKr0Yypv4rfLA" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_GM9Jope8EeKr0Yypv4rfLA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GM9Jo5e8EeKr0Yypv4rfLA" points="[-80, -7, 1239, 111]$[-1269, -117, 50, 1]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KtkOEJe8EeKr0Yypv4rfLA" type="3002" source="_FWDBsJe6EeKr0Yypv4rfLA" target="_ETjYAJe8EeKr0Yypv4rfLA">
-    <children xmi:type="notation:Node" xmi:id="_KtkOFJe8EeKr0Yypv4rfLA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KtkOFZe8EeKr0Yypv4rfLA" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KtkOFpe8EeKr0Yypv4rfLA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KtkOF5e8EeKr0Yypv4rfLA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KtkOEZe8EeKr0Yypv4rfLA" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KtkOEpe8EeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="DefaultName.ecore#//TableConfig/utilisé%20par%20"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KtkOE5e8EeKr0Yypv4rfLA" points="[-86, 0, -66, -338]$[-361, 0, -341, -338]$[-361, 331, -341, -7]$[-70, 331, -50, -7]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KtkOGJe8EeKr0Yypv4rfLA" id="(0.55,0.883495145631068)"/>
-  </edges>
-</notation:Diagram>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
deleted file mode 100644
index e543efee3db..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="nattable" nsURI="http://www.eclipse.org/papyrus/nattable/model"
-    nsPrefix="nattable">
-  <eClassifiers xsi:type="ecore:EClass" name="Table" eSuperTypes="#//nattableconfiguration/TableNamedElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="context" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tableConfiguration" lowerBound="1"
-        eType="#//nattableconfiguration/TableConfiguration"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="invertAxis" lowerBound="1"
-        eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="columnAxisProvidersHistory"
-        lowerBound="1" upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rowAxisProvidersHistory"
-        lowerBound="1" upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="localRowHeaderAxisConfiguration"
-        eType="#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="localColumnHeaderAxisConfiguration"
-        eType="#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="currentRowAxisProvider"
-        lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="currentColumnAxisProvider"
-        lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider"/>
-  </eClassifiers>
-  <eSubpackages name="nattableconfiguration" nsURI="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"
-      nsPrefix="nattableconfiguration">
-    <eClassifiers xsi:type="ecore:EClass" name="TableNamedElement" abstract="true"
-        eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TableConfiguration" eSuperTypes="#//nattableconfiguration/TableNamedElement">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="creationTester" eType="#//nattabletester/AbstractTableTester"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="cellEditorDeclaration"
-          lowerBound="1" eType="#//nattableconfiguration/CellEditorDeclaration" defaultValueLiteral="COLUMN"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="rowHeaderAxisConfiguration"
-          lowerBound="1" eType="#//nattableaxisconfiguration/TableHeaderAxisConfiguration"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="columnHeaderAxisConfiguration"
-          lowerBound="1" eType="#//nattableaxisconfiguration/TableHeaderAxisConfiguration"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="columnAxisProviders"
-          lowerBound="1" upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="rowAxisProviders" lowerBound="1"
-          upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="defaultRowAxisProvider"
-          lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="defaultColumnAxisProvider"
-          lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="CellEditorDeclaration">
-      <eLiterals name="COLUMN"/>
-      <eLiterals name="ROW" value="1"/>
-      <eLiterals name="CELL" value="2"/>
-    </eClassifiers>
-  </eSubpackages>
-  <eSubpackages name="nattableaxisprovider" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"
-      nsPrefix="nattableaxisprovider">
-    <eClassifiers xsi:type="ecore:EClass" name="AbstractAxisProvider" abstract="true"
-        eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement #//nattableconfiguration/TableNamedElement">
-      <eOperations name="getAxis" upperBound="-1" eType="#//nattableaxis/IAxis"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EStructuralFeatureValueAxisProvider"
-        eSuperTypes="#//nattableaxisprovider/ISynchronizedAxisProvider #//nattableaxisprovider/MasterEObjectAxisProvider">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="listenFeature" lowerBound="1"
-          eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="IMasterAxisProvider" abstract="true"
-        interface="true" eSuperTypes="#//nattableaxisprovider/AxisProvider"/>
-    <eClassifiers xsi:type="ecore:EClass" name="ISlaveAxisProvider" abstract="true"
-        interface="true" eSuperTypes="#//nattableaxisprovider/AxisProvider"/>
-    <eClassifiers xsi:type="ecore:EClass" name="ISynchronizedAxisProvider" abstract="true"
-        interface="true" eSuperTypes="#//nattableaxisprovider/AxisProvider"/>
-    <eClassifiers xsi:type="ecore:EClass" name="AxisProvider" abstract="true" eSuperTypes="#//nattableaxisprovider/AbstractAxisProvider">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="axis" upperBound="-1"
-          eType="#//nattableaxis/IAxis" containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="MasterEObjectAxisProvider" eSuperTypes="#//nattableaxisprovider/MasterObjectAxisProvider">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="pastedElementContainmentFeature"
-          eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="pastedElementId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="SlaveObjectAxisProvider" eSuperTypes="#//nattableaxisprovider/ISlaveAxisProvider"/>
-    <eClassifiers xsi:type="ecore:EClass" name="MasterObjectAxisProvider" eSuperTypes="#//nattableaxisprovider/IMasterAxisProvider"/>
-  </eSubpackages>
-  <eSubpackages name="nattablelabelprovider" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"
-      nsPrefix="nattablelabelprovider">
-    <eClassifiers xsi:type="ecore:EClass" name="AbstractLabelConfiguration" abstract="true"
-        eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelProviderContext"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="FeatureLabelProviderConfiguration"
-        eSuperTypes="#//nattablelabelprovider/ObjectLabelProviderConfiguration">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayIsDerived" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayType" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayMultiplicity"
-          lowerBound="1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="ObjectLabelProviderConfiguration"
-        eSuperTypes="#//nattablelabelprovider/AbstractLabelConfiguration">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayIcon" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayLabel" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-    </eClassifiers>
-  </eSubpackages>
-  <eSubpackages name="nattableaxisconfiguration" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"
-      nsPrefix="nattableaxisconfiguration">
-    <eClassifiers xsi:type="ecore:EClass" name="AbstractHeaderAxisConfiguration" abstract="true"
-        eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="indexStyle" lowerBound="1"
-          eType="#//nattableaxisconfiguration/AxisIndexStyle"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayLabel" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayFilter" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="false"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayIndex" lowerBound="1"
-          eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-          defaultValueLiteral="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="ownedLabelConfiguration"
-          upperBound="-1" eType="#//nattablelabelprovider/AbstractLabelConfiguration"
-          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="ownedAxisConfiguration"
-          upperBound="-1" eType="#//nattableaxisconfiguration/IAxisConfiguration"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="AxisIndexStyle">
-      <eLiterals name="ALPHABETIC" value="1" literal="ALPHABETIC"/>
-      <eLiterals name="NUMERIC" literal="NUMERIC"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TableHeaderAxisConfiguration" eSuperTypes="#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="axisManagers" lowerBound="1"
-          upperBound="-1" eType="#//nattableaxisconfiguration/AxisManager" containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="AxisManager">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="headerLabelConfiguration"
-          lowerBound="1" eType="#//nattablelabelprovider/AbstractLabelConfiguration"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaAxisManagerId" lowerBound="1"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="specificAxisConfiguration"
-          upperBound="-1" eType="#//nattableaxisconfiguration/IAxisConfiguration"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="AxisManagerConfiguration">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="localHeaderLabelConfiguration"
-          eType="#//nattablelabelprovider/AbstractLabelConfiguration"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="axisManager" lowerBound="1"
-          eType="#//nattableaxisconfiguration/AxisManager"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="localSpecificConfiguration"
-          upperBound="-1" eType="#//nattableaxisconfiguration/IAxisConfiguration"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="LocalTableHeaderAxisConfiguration"
-        eSuperTypes="#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="axisManagerConfigurations"
-          upperBound="-1" eType="#//nattableaxisconfiguration/AxisManagerConfiguration"
-          containment="true"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="FeatureAxisConfiguration" eSuperTypes="#//nattableaxisconfiguration/IAxisConfiguration">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="showOnlyCommonFeature"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="IAxisConfiguration"/>
-  </eSubpackages>
-  <eSubpackages name="nattabletester" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"
-      nsPrefix="nattabletester">
-    <eClassifiers xsi:type="ecore:EClass" name="AbstractTableTester" abstract="true"
-        eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
-      <eOperations name="getTester" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="JavaTableTester" eSuperTypes="#//nattabletester/AbstractTableTester">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="tester" lowerBound="1"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eClassifiers>
-  </eSubpackages>
-  <eSubpackages name="nattableaxis" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis"
-      nsPrefix="nattableaxis">
-    <eClassifiers xsi:type="ecore:EClass" name="IAxis" abstract="true" interface="true">
-      <eOperations name="getElement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
-      <eOperations name="getLocalLabelConfiguration" eType="#//nattablelabelprovider/AbstractLabelConfiguration"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="IdAxis" abstract="true" eSuperTypes="#//nattableaxis/IAxis">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="element" lowerBound="1"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="EObjectAxis" eSuperTypes="#//nattableaxis/ObjectAxis">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
-          eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="FeatureAxis" abstract="true" eSuperTypes="#//nattableaxis/IAxis">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="localLabelConfiguration"
-          eType="#//nattablelabelprovider/FeatureLabelProviderConfiguration"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="ObjectAxis" abstract="true" eSuperTypes="#//nattableaxis/IAxis">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="localLabelConfiguration"
-          eType="#//nattablelabelprovider/ObjectLabelProviderConfiguration"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="FeatureIdAxis" eSuperTypes="#//nattableaxis/IdAxis #//nattableaxis/FeatureAxis"/>
-    <eClassifiers xsi:type="ecore:EClass" name="EStructuralFeatureAxis" eSuperTypes="#//nattableaxis/FeatureAxis">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
-          eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="ObjectIdAxis" eSuperTypes="#//nattableaxis/IdAxis #//nattableaxis/ObjectAxis"/>
-  </eSubpackages>
-</ecore:EPackage>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
deleted file mode 100644
index 412c82281eb..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
+++ /dev/null
@@ -1,1285 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattable.ecorediag" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_EfChwKHtEeKNUa7kbzEWsw" type="1005">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA4KHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA4aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EfMSwKHtEeKNUa7kbzEWsw" type="4010"/>
-    <children xmi:type="notation:Node" xmi:id="_EfMSwaHtEeKNUa7kbzEWsw" type="5008">
-      <children xmi:type="notation:Node" xmi:id="_hJG1UqH0EeKNUa7kbzEWsw" type="2006">
-        <element xmi:type="ecore:EEnumLiteral" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle/ALPHABETIC"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJG1U6H0EeKNUa7kbzEWsw"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_hJG1UKH0EeKNUa7kbzEWsw" type="2006">
-        <element xmi:type="ecore:EEnumLiteral" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle/NUMERIC"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJG1UaH0EeKNUa7kbzEWsw"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSwqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSw6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMSxKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfChwaHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfChwqHtEeKNUa7kbzEWsw" x="10" y="910"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EfMSxaHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA4qHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA46HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EfMSyKHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EfMSyaHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSyqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSy6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMSzKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EfMSzaHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMSzqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMSz6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS0KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMSxqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMSx6HtEeKNUa7kbzEWsw" x="1010" y="1430" width="183"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EfMS3aHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA5qHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA56HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EfMS4KHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EfMS4aHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS4qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS46HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS5KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EfMS5aHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS5qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS56HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS6KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMS3qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMS36HtEeKNUa7kbzEWsw" x="1400" y="1255"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EfMS6aHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA6KHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA6aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EfMS7KHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EfMS7aHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS7qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS76HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS8KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EfMS8aHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMS8qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMS86HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMS9KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMS6qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AbstractAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMS66HtEeKNUa7kbzEWsw" x="1880" y="585" width="298" height="143"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EfMTDaHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA7qHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA76HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EfMTEKHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EfMTEaHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTEqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTE6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTFKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EfMTFaHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTFqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTF6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTGKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTDqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTD6HtEeKNUa7kbzEWsw" x="1685" y="155"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EfMTGaHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA8KHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA8aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EfMTHKHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EfMTHaHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTHqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTH6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTIKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EfMTIaHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfMTIqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfMTI6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfMTJKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTGqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/FeatureLabelProviderConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTG6HtEeKNUa7kbzEWsw" x="295" y="1255"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EfMTJaHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA8qHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA86HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EfVcsKHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EfVcsaHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVcsqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVcs6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVctKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EfVctaHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVctqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVct6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVcuKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfMTJqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/ObjectLabelProviderConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfMTJ6HtEeKNUa7kbzEWsw" x="415" y="925"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EfVcuaHtEeKNUa7kbzEWsw" type="1005">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA9KHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA9aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EfVcvKHtEeKNUa7kbzEWsw" type="4010"/>
-    <children xmi:type="notation:Node" xmi:id="_EfVcvaHtEeKNUa7kbzEWsw" type="5008">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVcvqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVcv6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVcwKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVcuqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableconfiguration/CellEditorDeclaration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVcu6HtEeKNUa7kbzEWsw" x="15" y="750"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EfVczaHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA-KHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA-aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EfVc0KHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EfVc0aHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc0qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc06HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc1KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EfVc1aHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc1qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc16HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc2KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVczqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVcz6HtEeKNUa7kbzEWsw" x="1315" y="395"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EfVc2aHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA-qHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA-6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EfVc3KHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EfVc3aHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc3qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc36HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc4KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EfVc4aHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc4qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc46HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc5KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc2qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EObjectAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc26HtEeKNUa7kbzEWsw" x="1595" y="1595"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EfVc5aHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA_KHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA_aHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EfVc6KHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EfVc6aHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc6qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc66HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc7KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EfVc7aHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc7qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc76HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc8KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc5qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattabletester/JavaTableTester"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc56HtEeKNUa7kbzEWsw" x="2195" y="460"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EfVc8aHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGA_qHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGA_6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EfVc9KHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EfVc9aHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc9qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc96HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc-KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EfVc-aHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVc-qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVc-6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVc_KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc8qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc86HtEeKNUa7kbzEWsw" x="850" y="400" width="228" height="88"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EfVc_aHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBAKHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBAaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EfVdAKHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EfVdAaHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdAqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdA6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdBKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EfVdBaHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdBqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdB6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdCKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVc_qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVc_6HtEeKNUa7kbzEWsw" x="1605" y="1435"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EfVdCaHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBAqHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBA6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EfVdDKHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EfVdDaHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdDqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdD6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdEKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EfVdEaHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EfVdEqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EfVdE6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EfVdFKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVdCqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVdC6HtEeKNUa7kbzEWsw" x="1425" y="610"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EfVdLaHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBCKHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBCaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EffNsKHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EffNsaHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNsqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNs6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNtKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EffNtaHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNtqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNt6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNuKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EfVdLqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/IAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfVdL6HtEeKNUa7kbzEWsw" x="80" y="355" height="93"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EffNuaHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBCqHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBC6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EffNvKHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EffNvaHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNvqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNv6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNwKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EffNwaHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNwqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNw6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNxKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffNuqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManager"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffNu6HtEeKNUa7kbzEWsw" x="950" y="150"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EffNxaHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBDKHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBDaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EffNyKHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EffNyaHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNyqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNy6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffNzKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EffNzaHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffNzqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffNz6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN0KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffNxqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureIdAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffNx6HtEeKNUa7kbzEWsw" x="1255" y="1595"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EffN0aHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBDqHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBD6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EffN1KHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EffN1aHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN1qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN16HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN2KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EffN2aHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN2qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN26HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN3KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN0qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/AbstractLabelConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN06HtEeKNUa7kbzEWsw" x="380" y="630" height="103"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EffN3aHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBEKHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBEaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EffN4KHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EffN4aHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN4qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN46HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN5KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EffN5aHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN5qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN56HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN6KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN3qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectIdAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN36HtEeKNUa7kbzEWsw" x="1425" y="1595"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EffN6aHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBEqHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBE6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EffN7KHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EffN7aHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN7qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN76HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN8KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EffN8aHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN8qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN86HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN9KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN6qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN66HtEeKNUa7kbzEWsw" x="1245" y="1435"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EffN9aHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBFKHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBFaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EffN-KHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EffN-aHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN-qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN-6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffN_KHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EffN_aHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffN_qHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffN_6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOAKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffN9qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IdAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffN96HtEeKNUa7kbzEWsw" x="1415" y="1435"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EffOAaHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBFqHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBF6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EffOBKHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EffOBaHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOBqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOB6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOCKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EffOCaHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOCqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOC6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffODKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOAqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/FeatureAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOA6HtEeKNUa7kbzEWsw" x="55" y="560"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EffODaHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBGKHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBGaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EffOEKHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EffOEaHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOEqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOE6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOFKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EffOFaHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOFqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOF6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOGKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffODqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattabletester/AbstractTableTester"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOD6HtEeKNUa7kbzEWsw" x="2210" y="295" width="208"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EffOJaHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBHKHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBHaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EffOKKHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EffOKaHtEeKNUa7kbzEWsw" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_hJZwTqH0EeKNUa7kbzEWsw" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableNamedElement/description"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJZwT6H0EeKNUa7kbzEWsw"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_hJZwTKH0EeKNUa7kbzEWsw" type="2001">
-        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/TableNamedElement/name"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hJZwTaH0EeKNUa7kbzEWsw"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOKqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOK6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOLKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EffOLaHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOLqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOL6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOMKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOJqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/TableNamedElement"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOJ6HtEeKNUa7kbzEWsw" x="2345" y="135"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EffOMaHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBHqHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBH6HtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EffONKHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EffONaHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffONqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffON6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOOKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EffOOaHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOOqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOO6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOPKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOMqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOM6HtEeKNUa7kbzEWsw" x="1655" y="670"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_EffOPaHtEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EkGBIKHtEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EkGBIaHtEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_EffOQKHtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_EffOQaHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffOQqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOQ6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffORKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EffORaHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EffORqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_EffOR6HtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_EffOSKHtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EffOPqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/TableConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EffOP6HtEeKNUa7kbzEWsw" x="2380" y="560" height="187"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_Ek_YwKHtEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_Ek_Yw6HtEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_Ek_YxKHtEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ek_YxaHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Ek_YxqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ek_Yx6HtEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Ek_YyKHtEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ek_YyaHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Ek_YyqHtEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ek_Yy6HtEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Ek_YwaHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//Table"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ek_YwqHtEeKNUa7kbzEWsw" x="2330" y="1075" height="146"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_rlVcQKH3EeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rlyIMKH3EeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rlyIMaH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_rlVcQ6H3EeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_rlVcRKH3EeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_rlVcRaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_rlVcRqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_rlVcR6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_rlVcSKH3EeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_rlVcSaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_rlVcSqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_rlVcS6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_rlVcQaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rlVcQqH3EeKNUa7kbzEWsw" x="785" y="1080"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_xjigEKH3EeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB4KH3EeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB4aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_xjigE6H3EeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_xjigFKH3EeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigFaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigFqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigF6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_xjigGKH3EeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigGaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigGqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigG6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjigEaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterObjectAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjigEqH3EeKNUa7kbzEWsw" x="1310" y="915"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_xjigHKH3EeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB4qH3EeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB46H3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_xjigH6H3EeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_xjigIKH3EeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigIaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigIqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigI6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_xjigJKH3EeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigJaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigJqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigJ6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjigHaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/SlaveObjectAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjigHqH3EeKNUa7kbzEWsw" x="1540" y="915"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_xjigKKH3EeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB5KH3EeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB5aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_xjigK6H3EeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_xjigLKH3EeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigLaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigLqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigL6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_xjigMKH3EeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjigMaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjigMqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjigM6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjigKaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/EStructuralFeatureValueAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjigKqH3EeKNUa7kbzEWsw" x="1160" y="1165"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_xjrqAKH3EeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB5qH3EeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB56H3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_xjrqA6H3EeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_xjrqBKH3EeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqBaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqBqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqB6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_xjrqCKH3EeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqCaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqCqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqC6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjrqAaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISynchronizedAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjrqAqH3EeKNUa7kbzEWsw" x="1070" y="1035"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_xjrqDKH3EeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB6KH3EeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB6aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_xjrqD6H3EeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_xjrqEKH3EeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqEaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqEqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqE6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_xjrqFKH3EeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqFaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqFqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqF6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjrqDaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/IMasterAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjrqDqH3EeKNUa7kbzEWsw" x="1315" y="795"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_xjrqGKH3EeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB6qH3EeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB66H3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_xjrqG6H3EeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_xjrqHKH3EeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqHaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqHqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqH6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_xjrqIKH3EeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqIaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqIqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqI6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjrqGaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterEObjectAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjrqGqH3EeKNUa7kbzEWsw" x="1305" y="1035"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_xjrqJKH3EeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xklB7KH3EeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xklB7aH3EeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_xjrqJ6H3EeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_xjrqKKH3EeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqKaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqKqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqK6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_xjrqLKH3EeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xjrqLaH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xjrqLqH3EeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xjrqL6H3EeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xjrqJaH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISlaveAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xjrqJqH3EeKNUa7kbzEWsw" x="1540" y="795"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>
-  <element xmi:type="ecore:EPackage" href="nattable.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_EghvgKHtEeKNUa7kbzEWsw" type="3003" source="_EfMSxaHtEeKNUa7kbzEWsw" target="_EffN6aHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EghvgaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EghvgqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eghvg6HtEeKNUa7kbzEWsw" points="[4, 9, -119, -33]$[92, 9, -31, -33]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8EqHtEeKNUa7kbzEWsw" id="(0.9731543624161074,0.36666666666666664)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8E6HtEeKNUa7kbzEWsw" id="(0.2882882882882883,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EgrghKHtEeKNUa7kbzEWsw" type="3002" source="_EffOMaHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_EgrgiKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgiaHtEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EgrgiqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgi6HtEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrghaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrghqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/AxisProvider/axis"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgh6HtEeKNUa7kbzEWsw" points="[0, 0, 230, 97]$[-230, -97, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGDaHtEeKNUa7kbzEWsw" id="(0.32919254658385094,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGDqHtEeKNUa7kbzEWsw" id="(0.8532608695652174,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EgrgjKHtEeKNUa7kbzEWsw" type="3003" source="_EffN9aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgjaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgjqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgj6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCaHtEeKNUa7kbzEWsw" id="(0.49612403100775193,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCqHtEeKNUa7kbzEWsw" id="(0.21739130434782608,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EgrgkKHtEeKNUa7kbzEWsw" type="3003" source="_EffN6aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgkaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgkqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgk6HtEeKNUa7kbzEWsw" points="[0, 0, -112, 94]$[0, -30, -112, 64]$[112, -30, 0, 64]$[112, -94, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BKHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BaHtEeKNUa7kbzEWsw" id="(0.10869565217391304,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EgrglKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc_aHtEeKNUa7kbzEWsw" target="_EfMS3aHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrglaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrglqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgl6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FKHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FaHtEeKNUa7kbzEWsw" id="(0.7065217391304348,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EgrgmKHtEeKNUa7kbzEWsw" type="3003" source="_EfMS6aHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgmaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgmqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgm6HtEeKNUa7kbzEWsw" points="[1, 0, -282, 442]$[1, -483, -282, -41]$[243, -483, -40, -41]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8CqHtEeKNUa7kbzEWsw" id="(0.7515527950310559,0.014705882352941176)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8C6HtEeKNUa7kbzEWsw" id="(0.2469879518072289,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EgrgnKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_EgrgoKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgoaHtEeKNUa7kbzEWsw" x="-93" y="24"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EgrgoqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgo6HtEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgnaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgnqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/columnAxisProviders"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgn6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IKHtEeKNUa7kbzEWsw" id="(0.021052631578947368,0.29411764705882354)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IaHtEeKNUa7kbzEWsw" id="(0.9295302013422819,0.14685314685314685)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EgrgpKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_EgrgqKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgqaHtEeKNUa7kbzEWsw" x="-93" y="15"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EgrgqqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgq6HtEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgpaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgpqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/rowAxisProviders"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgp6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8FqHtEeKNUa7kbzEWsw" id="(0.017543859649122806,0.42780748663101603)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8F6HtEeKNUa7kbzEWsw" id="(0.9362416107382551,0.3776223776223776)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EgrgrKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_EgrgsKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrgsaHtEeKNUa7kbzEWsw" x="-56" y="-20"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EgrgsqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgs6HtEeKNUa7kbzEWsw" x="23" y="-20"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgraHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgrqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/defaultRowAxisProvider"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgr6HtEeKNUa7kbzEWsw" points="[-3, -19, 71, 510]$[-73, -523, 1, 6]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8GqHtEeKNUa7kbzEWsw" id="(0.04912280701754386,0.7549019607843137)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8G6HtEeKNUa7kbzEWsw" id="(0.9832214765100671,0.7972027972027972)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EgrgtKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_EgrguKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EgrguaHtEeKNUa7kbzEWsw" x="-81" y="12"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EgrguqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Egrgu6HtEeKNUa7kbzEWsw" x="7" y="12"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EgrgtaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EgrgtqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/defaultColumnAxisProvider"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Egrgt6HtEeKNUa7kbzEWsw" points="[0, -3, 27, 510]$[-27, -507, 0, 6]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8HKHtEeKNUa7kbzEWsw" id="(0.0,0.6203208556149733)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8HaHtEeKNUa7kbzEWsw" id="(0.9563758389261745,0.6363636363636364)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Eg0qcKHtEeKNUa7kbzEWsw" type="3003" source="_EffOMaHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg0qcaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg0qcqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg0qc6HtEeKNUa7kbzEWsw" points="[0, 0, 31, 155]$[0, -69, 31, 86]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGD6HtEeKNUa7kbzEWsw" id="(0.6645962732919255,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEKHtEeKNUa7kbzEWsw" id="(0.10067114093959731,0.3916083916083916)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Eg0qhKHtEeKNUa7kbzEWsw" type="3002" source="_EfMTDaHtEeKNUa7kbzEWsw" target="_EffNuaHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_Eg0qiKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg0qiaHtEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Eg0qiqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg0qi6HtEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg0qhaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg0qhqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration/axisManagers"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg0qh6HtEeKNUa7kbzEWsw" points="[-173, -7, 556, 0]$[-722, -7, 7, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGBaHtEeKNUa7kbzEWsw" id="(0.8793969849246231,0.7666666666666667)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGBqHtEeKNUa7kbzEWsw" id="(0.9627659574468085,0.6470588235294118)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Eg0qjKHtEeKNUa7kbzEWsw" type="3003" source="_EfMTDaHtEeKNUa7kbzEWsw" target="_EfVdCaHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg0qjaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg0qjqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg0qj6HtEeKNUa7kbzEWsw" points="[13, 8, 198, -412]$[13, 130, 198, -290]$[-161, 130, 24, -290]$[-161, 405, 24, -15]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGA6HtEeKNUa7kbzEWsw" id="(0.36180904522613067,0.8666666666666667)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGBKHtEeKNUa7kbzEWsw" id="(0.7115384615384616,0.13445378151260504)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Eg-bfKHtEeKNUa7kbzEWsw" type="3003" source="_EfMTGaHtEeKNUa7kbzEWsw" target="_EfMTJaHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bfaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bfqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bf6HtEeKNUa7kbzEWsw" points="[-53, 0, -81, 264]$[-53, -288, -81, -24]$[9, -288, -19, -24]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF96HtEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF-KHtEeKNUa7kbzEWsw" id="(0.091324200913242,0.8)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Eg-bgKHtEeKNUa7kbzEWsw" type="3002" source="_EffN6aHtEeKNUa7kbzEWsw" target="_EfMTGaHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_Eg-bhKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bhaHtEeKNUa7kbzEWsw" x="-12" y="-83"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Eg-bhqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bh6HtEeKNUa7kbzEWsw" x="-32" y="-37"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bgaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bgqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/FeatureAxis/localLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bg6HtEeKNUa7kbzEWsw" points="[-9, 58, 813, 121]$[-9, 95, 813, 158]$[-822, 95, 0, 158]$[-822, -63, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8BqHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8B6HtEeKNUa7kbzEWsw" id="(0.8214285714285714,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Eg-biKHtEeKNUa7kbzEWsw" type="3003" source="_EfMTJaHtEeKNUa7kbzEWsw" target="_EffN0aHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-biaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-biqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bi6HtEeKNUa7kbzEWsw" points="[28, -24, -111, 211]$[28, -218, -111, 17]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGFaHtEeKNUa7kbzEWsw" id="(0.1050228310502283,0.29411764705882354)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGFqHtEeKNUa7kbzEWsw" id="(0.9705882352941176,0.8382352941176471)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Eg-bjKHtEeKNUa7kbzEWsw" type="3002" source="_EfVc_aHtEeKNUa7kbzEWsw" target="_EfMTJaHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_Eg-bkKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bkaHtEeKNUa7kbzEWsw" x="84" y="84"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Eg-bkqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Eg-bk6HtEeKNUa7kbzEWsw" x="44" y="15"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Eg-bjaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Eg-bjqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/ObjectAxis/localLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Eg-bj6HtEeKNUa7kbzEWsw" points="[0, 0, 1127, 427]$[0, -45, 1127, 382]$[-1136, -45, -9, 382]$[-1136, -427, -9, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGGaHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGGqHtEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhHlYKHtEeKNUa7kbzEWsw" type="3002" source="_EfVczaHtEeKNUa7kbzEWsw" target="_EfVc8aHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_EhHlZKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhHlZaHtEeKNUa7kbzEWsw" x="-42" y="-89"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EhHlZqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhHlZ6HtEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlYaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlYqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration/axisManagerConfigurations"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlY6HtEeKNUa7kbzEWsw" points="[-12, 1, 286, -14]$[-261, 13, 37, -2]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8AKHtEeKNUa7kbzEWsw" id="(0.056768558951965066,0.8)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8AaHtEeKNUa7kbzEWsw" id="(0.8947368421052632,0.5568181818181818)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhHlaKHtEeKNUa7kbzEWsw" type="3003" source="_EfVczaHtEeKNUa7kbzEWsw" target="_EfVdCaHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlaaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlaqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHla6HtEeKNUa7kbzEWsw" points="[0, 0, -255, 239]$[0, -209, -255, 30]$[255, -209, 0, 30]$[255, -239, 0, 0]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGHKHtEeKNUa7kbzEWsw" id="(0.3317307692307692,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhHlbKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc2aHtEeKNUa7kbzEWsw" target="_EfVc_aHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlbaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlbqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlb6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 102]$[0, -102, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF9aHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF9qHtEeKNUa7kbzEWsw" id="(0.4144144144144144,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhHlcKHtEeKNUa7kbzEWsw" type="3003" source="_EfVc5aHtEeKNUa7kbzEWsw" target="_EffODaHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhHlcaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhHlcqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhHlc6HtEeKNUa7kbzEWsw" points="[0, 0, 254, 111]$[0, -30, 254, 81]$[-254, -30, 0, 81]$[-254, -111, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGAaHtEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGAqHtEeKNUa7kbzEWsw" id="(0.25,0.9264705882352942)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhRWYKHtEeKNUa7kbzEWsw" type="3002" source="_EfVc8aHtEeKNUa7kbzEWsw" target="_EffN0aHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_EhRWZKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWZaHtEeKNUa7kbzEWsw" x="-70" y="-189"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EhRWZqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWZ6HtEeKNUa7kbzEWsw" x="-70" y="-314"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWYaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhRWYqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/localHeaderLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhRWY6HtEeKNUa7kbzEWsw" points="[-14, 0, 364, -186]$[-384, 0, -6, -186]$[-384, 180, -6, -6]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGH6HtEeKNUa7kbzEWsw" id="(0.06578947368421052,0.8181818181818182)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGIKHtEeKNUa7kbzEWsw" id="(0.4411764705882353,0.14705882352941177)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhRWaKHtEeKNUa7kbzEWsw" type="3002" source="_EfVc8aHtEeKNUa7kbzEWsw" target="_EffNuaHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_EhRWbKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWbaHtEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EhRWbqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWb6HtEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWaaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhRWaqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/axisManager"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhRWa6HtEeKNUa7kbzEWsw" points="[-7, -1, 0, 187]$[-7, -185, 0, 3]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8CKHtEeKNUa7kbzEWsw" id="(0.8440366972477065,0.016666666666666666)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8CaHtEeKNUa7kbzEWsw" id="(0.44680851063829785,0.9558823529411765)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhRWcKHtEeKNUa7kbzEWsw" type="3002" source="_EfVc8aHtEeKNUa7kbzEWsw" target="_EfVdLaHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_EhRWdKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWdaHtEeKNUa7kbzEWsw" x="-31" y="24"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EhRWdqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWd6HtEeKNUa7kbzEWsw" y="-16"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWcaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhRWcqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/localSpecificConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhRWc6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 286]$[0, -286, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGHaHtEeKNUa7kbzEWsw" id="(0.07894736842105263,0.19318181818181818)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGHqHtEeKNUa7kbzEWsw" id="(0.9893617021276596,0.6344086021505376)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhRWeKHtEeKNUa7kbzEWsw" type="3003" source="_EffN3aHtEeKNUa7kbzEWsw" target="_EfVc_aHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWeaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhRWeqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhRWe6HtEeKNUa7kbzEWsw" points="[0, 0, -120, 102]$[0, -30, -120, 72]$[120, -30, 0, 72]$[120, -102, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGE6HtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGFKHtEeKNUa7kbzEWsw" id="(0.2072072072072072,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhRWfKHtEeKNUa7kbzEWsw" type="3002" source="_EfVdCaHtEeKNUa7kbzEWsw" target="_EffN0aHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_EhRWgKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWgaHtEeKNUa7kbzEWsw" x="-172" y="17"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EhRWgqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWg6HtEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWfaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhRWfqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration/ownedLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhRWf6HtEeKNUa7kbzEWsw" points="[0, 0, 230, 99]$[-230, -99, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF-6HtEeKNUa7kbzEWsw" id="(0.14423076923076922,0.8235294117647058)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF_KHtEeKNUa7kbzEWsw" id="(0.9313725490196079,0.7281553398058253)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhRWhKHtEeKNUa7kbzEWsw" type="3002" source="_EfVdCaHtEeKNUa7kbzEWsw" target="_EfVdLaHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_EhRWiKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWiaHtEeKNUa7kbzEWsw" x="-817" y="342"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EhRWiqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhRWi6HtEeKNUa7kbzEWsw" x="-725" y="295"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWhaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhRWhqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration/ownedAxisConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhRWh6HtEeKNUa7kbzEWsw" points="[-11, -7, 1191, 179]$[-886, -7, 316, 179]$[-1202, -186, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF-aHtEeKNUa7kbzEWsw" id="(0.057692307692307696,0.19327731092436976)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF-qHtEeKNUa7kbzEWsw" id="(0.8297872340425532,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhbHbKHtEeKNUa7kbzEWsw" type="3002" source="_EffNuaHtEeKNUa7kbzEWsw" target="_EfVdLaHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_EhbHcKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhbHcaHtEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EhbHcqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhbHc6HtEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhbHbaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhbHbqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManager/specificAxisConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhbHb6HtEeKNUa7kbzEWsw" points="[-128, 0, 793, -201]$[-921, 0, 0, -201]$[-921, 201, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8JqHtEeKNUa7kbzEWsw" id="(0.6914893617021277,0.07352941176470588)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8J6HtEeKNUa7kbzEWsw" id="(0.4148936170212766,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhbHdKHtEeKNUa7kbzEWsw" type="3003" source="_EffOAaHtEeKNUa7kbzEWsw" target="_EfVdLaHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhbHdaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhbHdqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhbHd6HtEeKNUa7kbzEWsw" points="[-3, 0, 19, 114]$[-3, -114, 19, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGB6HtEeKNUa7kbzEWsw" id="(0.2931726907630522,0.014705882352941176)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCKHtEeKNUa7kbzEWsw" id="(0.25,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhbHeKHtEeKNUa7kbzEWsw" type="3002" source="_EffNuaHtEeKNUa7kbzEWsw" target="_EffN0aHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_EhbHfKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhbHfaHtEeKNUa7kbzEWsw" x="-277" y="-111"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EhbHfqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhbHf6HtEeKNUa7kbzEWsw" x="-286" y="-208"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhbHeaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhbHeqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManager/headerLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhbHe6HtEeKNUa7kbzEWsw" points="[-6, -9, 506, -447]$[-512, -9, 0, -447]$[-512, 431, 0, -7]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8KKHtEeKNUa7kbzEWsw" id="(0.03723404255319149,0.75)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzF8KHtEeKNUa7kbzEWsw" id="(0.31862745098039214,0.11764705882352941)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhkRUKHtEeKNUa7kbzEWsw" type="3003" source="_EffNxaHtEeKNUa7kbzEWsw" target="_EffN9aHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRUaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRUqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRU6HtEeKNUa7kbzEWsw" points="[0, 0, -111, 94]$[0, -30, -111, 64]$[111, -30, 0, 64]$[111, -94, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DKHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DaHtEeKNUa7kbzEWsw" id="(0.24806201550387597,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhkRVKHtEeKNUa7kbzEWsw" type="3003" source="_EffNxaHtEeKNUa7kbzEWsw" target="_EffN6aHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRVaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRVqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRV6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 102]$[0, -102, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DqHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8D6HtEeKNUa7kbzEWsw" id="(0.5765765765765766,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhkRWKHtEeKNUa7kbzEWsw" type="3003" source="_EffN3aHtEeKNUa7kbzEWsw" target="_EffN9aHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRWaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRWqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRW6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEaHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEqHtEeKNUa7kbzEWsw" id="(0.49612403100775193,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhuCUKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EffODaHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_EhuCVKHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhuCVaHtEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_EhuCVqHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhuCV6HtEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhuCUaHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhuCUqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/creationTester"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhuCU6HtEeKNUa7kbzEWsw" points="[0, 0, 89, 284]$[-89, -284, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IqHtEeKNUa7kbzEWsw" id="(0.05964912280701754,0.0427807486631016)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8I6HtEeKNUa7kbzEWsw" id="(0.8920454545454546,0.9705882352941176)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_EhuCWKHtEeKNUa7kbzEWsw" type="3003" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhuCWaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_EhuCWqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhuCW6HtEeKNUa7kbzEWsw" points="[-169, 0, 1, 431]$[-169, -427, 1, 4]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGIaHtEeKNUa7kbzEWsw" id="(0.9403508771929825,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGIqHtEeKNUa7kbzEWsw" id="(0.8012048192771084,0.9529411764705882)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Ek_YzqHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EffOPaHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_Ek_Y0qHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y06HtEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Ek_Y1KHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y1aHtEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Yz6HtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y0KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/tableConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y0aHtEeKNUa7kbzEWsw" points="[9, -10, 0, 336]$[9, -340, 0, 6]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ir5h8KHtEeKNUa7kbzEWsw" id="(0.8552631578947368,0.07534246575342465)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kbepMKHtEeKNUa7kbzEWsw" id="(0.3087719298245614,0.9411764705882353)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Ek_Y1qHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_Ek_Y2qHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y26HtEeKNUa7kbzEWsw" x="-335" y="102"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Ek_Y3KHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y3aHtEeKNUa7kbzEWsw" x="-325" y="20"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Y16HtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y2KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/columnAxisProvidersHistory"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y2aHtEeKNUa7kbzEWsw" points="[-146, 0, 271, 460]$[-411, 0, 6, 460]$[-411, -453, 6, 7]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7tvZUKHuEeKNUa7kbzEWsw" id="(0.9736842105263158,0.726027397260274)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6fePYKHuEeKNUa7kbzEWsw" id="(0.6073825503355704,0.8970588235294118)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Ek_Y3qHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_Ek_Y4qHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y46HtEeKNUa7kbzEWsw" x="-356" y="129"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Ek_Y5KHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y5aHtEeKNUa7kbzEWsw" x="-356" y="37"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Y36HtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y4KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/rowAxisProvidersHistory"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y4aHtEeKNUa7kbzEWsw" points="[-145, 0, 308, 485]$[-445, 0, 8, 485]$[-445, -480, 8, 5]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8EDnkKHuEeKNUa7kbzEWsw" id="(0.9671052631578947,0.910958904109589)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__1i8MKHuEeKNUa7kbzEWsw" id="(0.4798657718120805,0.9264705882352942)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_ElJJ0KHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_ElJJ1KHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ1aHtEeKNUa7kbzEWsw" x="-309" y="104"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_ElJJ1qHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ16HtEeKNUa7kbzEWsw" x="-308" y="19"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ0aHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ0qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/currentRowAxisProvider"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ06HtEeKNUa7kbzEWsw" points="[-137, 0, 235, 423]$[-372, 0, 0, 423]$[-372, -420, 0, 3]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ETwEKHuEeKNUa7kbzEWsw" id="(0.9144736842105263,0.4931506849315068)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AyW7AKH1EeKNUa7kbzEWsw" id="(0.7281879194630873,0.9558823529411765)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_ElJJ2KHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_ElJJ3KHtEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ3aHtEeKNUa7kbzEWsw" x="-235" y="120"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_ElJJ3qHtEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ36HtEeKNUa7kbzEWsw" x="-230" y="31"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ2aHtEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ2qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/currentColumnAxisProvider"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ26HtEeKNUa7kbzEWsw" points="[-90, 0, 197, 386]$[-287, 0, 0, 386]$[-287, -384, 0, 2]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0FtQ8KHuEeKNUa7kbzEWsw" id="(0.6052631578947368,0.2465753424657534)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vXzXYKHuEeKNUa7kbzEWsw" id="(0.8557046979865772,0.9705882352941176)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_ElJJ4KHtEeKNUa7kbzEWsw" type="3003" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ4aHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ4qHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ46HtEeKNUa7kbzEWsw" points="[5, 40, -4, 1013]$[315, 40, 306, 1013]$[315, -931, 306, 42]$[34, -931, 25, 42]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zdYFoKHuEeKNUa7kbzEWsw" id="(0.9671052631578947,0.2328767123287671)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a_dasKHtEeKNUa7kbzEWsw" id="(0.8493975903614458,0.011764705882352941)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_FIJaHKH2EeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMTDaHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_FIJaIKH2EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaIaH2EeKNUa7kbzEWsw" x="-118" y="-19"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_FIJaIqH2EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaI6H2EeKNUa7kbzEWsw" x="-3" y="-24"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FIJaHaH2EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_FIJaHqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/rowHeaderAxisConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FIJaH6H2EeKNUa7kbzEWsw" points="[0, -7, 691, 404]$[0, -493, 691, -82]$[-682, -493, 9, -82]$[-682, -412, 9, -1]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JJrV0KH2EeKNUa7kbzEWsw" id="(0.5578947368421052,0.0427807486631016)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a5to8KH2EeKNUa7kbzEWsw" id="(0.8190954773869347,0.03333333333333333)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_FIJaJKH2EeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMTDaHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_FIJaKKH2EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaKaH2EeKNUa7kbzEWsw" x="-31" y="28"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_FITLEKH2EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FITLEaH2EeKNUa7kbzEWsw" x="79" y="13"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FIJaJaH2EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_FIJaJqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/columnHeaderAxisConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FIJaJ6H2EeKNUa7kbzEWsw" points="[-7, -8, 798, 384]$[-7, -518, 798, -126]$[-805, -518, 0, -126]$[-805, -413, 0, -21]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PMCg4KH2EeKNUa7kbzEWsw" id="(0.9438596491228071,0.0481283422459893)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OSd0kKH2EeKNUa7kbzEWsw" id="(0.7989949748743719,0.36666666666666664)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_hoQknKH2EeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfVczaHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_hoQkoKH2EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkoaH2EeKNUa7kbzEWsw" x="-955" y="189"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_hoQkoqH2EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQko6H2EeKNUa7kbzEWsw" x="-949" y="65"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hoQknaH2EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_hoQknqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/localRowHeaderAxisConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hoQkn6H2EeKNUa7kbzEWsw" points="[7, 5, 915, 798]$[7, 211, 915, 1004]$[-598, 211, 310, 1004]$[-608, -793, 300, 0]$[-906, -793, 2, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NyG_cKJ4EeKNUa7kbzEWsw" id="(0.7894736842105263,0.9657534246575342)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uz2j4KJ4EeKNUa7kbzEWsw" id="(0.9912663755458515,0.45)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_hoQkpKH2EeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfVczaHtEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_hoQkqKH2EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkqaH2EeKNUa7kbzEWsw" x="-394" y="-888"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_hoQkqqH2EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkq6H2EeKNUa7kbzEWsw" x="-246" y="-893"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hoQkpaH2EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_hoQkpqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/localColumnHeaderAxisConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hoQkp6H2EeKNUa7kbzEWsw" points="[1, 6, 843, 815]$[1, 131, 843, 940]$[-480, 131, 362, 940]$[-480, -803, 362, 6]$[-838, -803, 4, 6]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NTAooKJ4EeKNUa7kbzEWsw" id="(0.3355263157894737,0.958904109589041)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m2_6UKH2EeKNUa7kbzEWsw" id="(0.982532751091703,0.16666666666666666)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_rlo-QKH3EeKNUa7kbzEWsw" type="3002" source="_EfMSxaHtEeKNUa7kbzEWsw" target="_rlVcQKH3EeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_rlo-RKH3EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_rlo-RaH3EeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_rlo-RqH3EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_rlo-R6H3EeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_rlo-QaH3EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_rlo-QqH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis/element"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rlo-Q6H3EeKNUa7kbzEWsw" points="[-20, -29, 1099, 1596]$[-1118, -1624, 1, 1]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_xj1bAqH3EeKNUa7kbzEWsw" type="3003" source="_xjigEKH3EeKNUa7kbzEWsw" target="_xjrqDKH3EeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj1bA6H3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xj1bBKH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj1bBaH3EeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4KH3EeKNUa7kbzEWsw" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4aH3EeKNUa7kbzEWsw" id="(0.4968944099378882,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_xj1bBqH3EeKNUa7kbzEWsw" type="3003" source="_xjrqGKH3EeKNUa7kbzEWsw" target="_xjigEKH3EeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj1bB6H3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xj1bCKH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj1bCaH3EeKNUa7kbzEWsw" points="[7, 0, 5, 62]$[7, -62, 5, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ5KH3EeKNUa7kbzEWsw" id="(0.4972067039106145,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ5aH3EeKNUa7kbzEWsw" id="(0.5,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_xj_MAKH3EeKNUa7kbzEWsw" type="3003" source="_xjigHKH3EeKNUa7kbzEWsw" target="_xjrqJKH3EeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MAaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MAqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MA6H3EeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4qH3EeKNUa7kbzEWsw" id="(0.4968944099378882,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ46H3EeKNUa7kbzEWsw" id="(0.4968944099378882,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_xj_MBKH3EeKNUa7kbzEWsw" type="3002" source="_xjigKKH3EeKNUa7kbzEWsw" target="_rlVcQKH3EeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_xj_MCKH3EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xj_MCaH3EeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_xj_MCqH3EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xj_MC6H3EeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MBaH3EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MBqH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/EStructuralFeatureValueAxisProvider/listenFeature"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MB6H3EeKNUa7kbzEWsw" points="[0, 1, -688, -1526]$[645, 1431, -43, -96]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BkTl0KJ4EeKNUa7kbzEWsw" id="(0.9815668202764977,0.5538461538461539)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_xj_MDKH3EeKNUa7kbzEWsw" type="3003" source="_xjigKKH3EeKNUa7kbzEWsw" target="_xjrqAKH3EeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MDaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MDqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MD6H3EeKNUa7kbzEWsw" points="[0, 0, 79, 68]$[0, -30, 79, 38]$[-79, -30, 0, 38]$[-79, -68, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ6KH3EeKNUa7kbzEWsw" id="(0.33043478260869563,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ6aH3EeKNUa7kbzEWsw" id="(0.49710982658959535,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_xj_MEKH3EeKNUa7kbzEWsw" type="3003" source="_xjigKKH3EeKNUa7kbzEWsw" target="_xjrqGKH3EeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MEaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MEqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_ME6H3EeKNUa7kbzEWsw" points="[0, 0, -80, 60]$[0, -30, -80, 30]$[80, -30, 0, 30]$[80, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ5qH3EeKNUa7kbzEWsw" id="(0.6652173913043479,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ56H3EeKNUa7kbzEWsw" id="(0.4972067039106145,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_xj_MFKH3EeKNUa7kbzEWsw" type="3003" source="_xjrqAKH3EeKNUa7kbzEWsw" target="_EffOMaHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MFaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MFqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MF6H3EeKNUa7kbzEWsw" points="[40, -29, -539, 336]$[40, -59, -539, 306]$[550, -59, -29, 306]$[550, -336, -29, 29]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_xj_MGKH3EeKNUa7kbzEWsw" type="3003" source="_xjrqDKH3EeKNUa7kbzEWsw" target="_EffOMaHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MGaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MGqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MG6H3EeKNUa7kbzEWsw" points="[1, 0, -1734, -700]$[1663, 671, -72, -29]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_xkIV8KH3EeKNUa7kbzEWsw" type="3002" source="_xjrqGKH3EeKNUa7kbzEWsw" target="_rlVcQKH3EeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_xkIV9KH3EeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xkIV9aH3EeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_xkIV9qH3EeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xkIV96H3EeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xkIV8aH3EeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xkIV8qH3EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/MasterEObjectAxisProvider/pastedElementContainmentFeature"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xkIV86H3EeKNUa7kbzEWsw" points="[0, 14, 477, -153]$[0, 158, 477, -9]$[-470, 158, 7, -9]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-wlhAKJ3EeKNUa7kbzEWsw" id="(0.9329608938547486,0.7941176470588235)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-YoUAKJ3EeKNUa7kbzEWsw" id="(0.967741935483871,0.9025641025641026)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_xkIV-KH3EeKNUa7kbzEWsw" type="3003" source="_xjrqJKH3EeKNUa7kbzEWsw" target="_EffOMaHtEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xkIV-aH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xkIV-qH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xkIV-6H3EeKNUa7kbzEWsw" points="[1, 0, -1734, -700]$[1663, 671, -72, -29]"/>
-  </edges>
-</notation:Diagram>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattable.genmodel b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattable.genmodel
deleted file mode 100644
index 8e695a71812..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattable.genmodel
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;&#x9;Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.infra.nattable.model/src-gen" editDirectory="/org.eclipse.papyrus.infra.nattable.model.edit/src-gen"
-    editorDirectory="/org.eclipse.papyrus.infra.nattable.model.editor/src-gen" modelPluginID="org.eclipse.papyrus.infra.nattable.model"
-    modelName="Nattable" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    testsDirectory="/org.eclipse.papyrus.infra.nattable.model.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
-    operationReflection="true" importOrganizing="true">
-  <foreignModel>nattable.ecore</foreignModel>
-  <genPackages prefix="Nattable" basePackage="org.eclipse.papyrus.infra.nattable.model"
-      disposableProviderFactory="true" ecorePackage="nattable.ecore#/">
-    <genClasses ecoreClass="nattable.ecore#//Table">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nattable.ecore#//Table/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nattable.ecore#//Table/context"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nattable.ecore#//Table/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nattable.ecore#//Table/editorConfiguration"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nattable.ecore#//Table/verticalContentProvider"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nattable.ecore#//Table/horizontalContentProvider"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="nattable.ecore#//IAxisContentsProvider">
-      <genOperations ecoreOperation="nattable.ecore#//IAxisContentsProvider/getAxis"/>
-    </genClasses>
-    <genClasses ecoreClass="nattable.ecore#//DefaultContentProvider">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nattable.ecore#//DefaultContentProvider/axis"/>
-    </genClasses>
-    <genClasses ecoreClass="nattable.ecore#//EObjectAxis">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nattable.ecore#//EObjectAxis/element"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="nattable.ecore#//IAxis">
-      <genOperations ecoreOperation="nattable.ecore#//IAxis/getElement"/>
-    </genClasses>
-    <genClasses ecoreClass="nattable.ecore#//EMFFeatureContentProvider">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nattable.ecore#//EMFFeatureContentProvider/feature"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="nattable.ecore#//ISynchronizedAxisContentProvider"/>
-    <nestedGenPackages prefix="Tableconfiguration" basePackage="org.eclipse.papyrus.infra.nattable.model"
-        disposableProviderFactory="true" ecorePackage="nattable.ecore#//tableconfiguration">
-      <genClasses ecoreClass="nattable.ecore#//tableconfiguration/TableEditorConfiguration">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nattable.ecore#//tableconfiguration/TableEditorConfiguration/pastedElementTypeId"/>
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference nattable.ecore#//tableconfiguration/TableEditorConfiguration/pastedElementContainmentFeature"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nattable.ecore#//tableconfiguration/TableEditorConfiguration/javaVerticalContentProviderIds"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nattable.ecore#//tableconfiguration/TableEditorConfiguration/javaHorizontalContentProviderIds"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nattable.ecore#//tableconfiguration/TableEditorConfiguration/defaultVerticalContentProvider"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nattable.ecore#//tableconfiguration/TableEditorConfiguration/defaultHorizontalContentProvider"/>
-      </genClasses>
-      <genClasses ecoreClass="nattable.ecore#//tableconfiguration/LocalTableEditorConfiguration">
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference nattable.ecore#//tableconfiguration/LocalTableEditorConfiguration/defaultTableEditorConfiguration"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nattable.ecore#//tableconfiguration/LocalTableEditorConfiguration/type"/>
-      </genClasses>
-    </nestedGenPackages>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag
deleted file mode 100644
index db85685b5a0..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattableaxis.ecorediag" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_e_NAAKHoEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_e_NAA6HoEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_e_NABKHoEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NABaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NABqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAB6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_e_NACKHoEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NACaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NACqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAC6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAAaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureIdAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAAqHoEeKNUa7kbzEWsw" x="755" y="525"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_e_NADKHoEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_e_NAD6HoEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_e_NAEKHoEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAEaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAEqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAE6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_e_NAFKHoEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAFaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAFqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAF6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NADaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectIdAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NADqHoEeKNUa7kbzEWsw" x="590" y="525"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_e_NAGKHoEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_e_NAG6HoEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_e_NAHKHoEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAHaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAHqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAH6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_e_NAIKHoEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAIaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAIqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAI6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAGaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/ObjectAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAGqHoEeKNUa7kbzEWsw" x="500" y="350"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_e_NAJKHoEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_e_NAJ6HoEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_e_NAKKHoEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAKaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAKqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAK6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_e_NALKHoEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NALaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NALqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAL6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAJaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/FeatureAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAJqHoEeKNUa7kbzEWsw" x="850" y="350"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_e_NAMKHoEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_e_NAM6HoEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_e_NANKHoEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NANaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NANqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAN6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_e_NAOKHoEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAOaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAOqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAO6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAMaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IdAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAMqHoEeKNUa7kbzEWsw" x="665" y="350"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_e_NAPKHoEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_e_NAP6HoEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_e_NAQKHoEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAQaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAQqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAQ6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_e_NARKHoEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NARaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NARqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAR6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NAPaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NAPqHoEeKNUa7kbzEWsw" x="455" y="220"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_e_NASKHoEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_e_NAS6HoEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_e_NATKHoEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NATaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NATqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAT6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_e_NAUKHoEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_NAUaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_NAUqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_NAU6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_NASaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_NASqHoEeKNUa7kbzEWsw" x="920" y="525"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_e_WxAKHoEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_e_WxA6HoEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_e_WxBKHoEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_WxBaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_WxBqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_WxB6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_e_WxCKHoEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e_WxCaHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e_WxCqHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e_WxC6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_e_WxAaHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/EObjectAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e_WxAqHoEeKNUa7kbzEWsw" x="430" y="460"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_hgnz4KHoEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hhEf0KHoEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hhEf0aHoEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_hgnz46HoEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_hgnz5KHoEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_hgnz5aHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_hgnz5qHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hgnz56HoEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_hgnz6KHoEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_hgnz6aHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_hgnz6qHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hgnz66HoEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_hgnz4aHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hgnz4qHoEeKNUa7kbzEWsw" x="880" y="700"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_kA2U8KHoEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kBTA4KHoEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kBTA4aHoEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_kA2U86HoEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_kA2U9KHoEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_kA2U9aHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_kA2U9qHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kA2U96HoEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_kA2U-KHoEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_kA2U-aHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_kA2U-qHoEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kA2U-6HoEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_kA2U8aHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kA2U8qHoEeKNUa7kbzEWsw" x="250" y="625"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_g0n0EKHpEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_g06vAKHpEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_g06vAaHpEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_g0n0E6HpEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_g0n0FKHpEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_g0n0FaHpEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_g0n0FqHpEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_g0n0F6HpEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_g0n0GKHpEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_g0n0GaHpEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_g0n0GqHpEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_g0n0G6HpEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_g0n0EaHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/FeatureLabelProviderConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g0n0EqHpEeKNUa7kbzEWsw" x="825" y="-15"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_hPGwoKHpEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hPZrkKHpEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hPZrkaHpEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_hPGwo6HpEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_hPGwpKHpEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_hPGwpaHpEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_hPGwpqHpEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hPGwp6HpEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_hPGwqKHpEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_hPGwqaHpEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_hPGwqqHpEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_hPGwq6HpEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_hPGwoaHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/ObjectLabelProviderConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hPGwoqHpEeKNUa7kbzEWsw" x="75" y="-15"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>
-  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxis"/>
-  <edges xmi:type="notation:Edge" xmi:id="_e_f68KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAAKHoEeKNUa7kbzEWsw" target="_e_NAMKHoEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_f68aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_e_f68qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_f686HoEeKNUa7kbzEWsw" points="[0, 0, 41, 60]$[0, -30, 41, 30]$[-41, -30, 0, 30]$[-41, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6KHoEeKNUa7kbzEWsw" id="(0.3333333333333333,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6aHoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_e_f69KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAAKHoEeKNUa7kbzEWsw" target="_e_NAJKHoEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_f69aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_e_f69qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_f696HoEeKNUa7kbzEWsw" points="[0, 0, -62, 68]$[0, -30, -62, 38]$[62, -30, 0, 38]$[62, -68, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX6qHoEeKNUa7kbzEWsw" id="(0.6666666666666666,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX66HoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_e_pr8KHoEeKNUa7kbzEWsw" type="3003" source="_e_NADKHoEeKNUa7kbzEWsw" target="_e_NAMKHoEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr8aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr8qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr86HoEeKNUa7kbzEWsw" points="[0, 0, -44, 60]$[0, -30, -44, 30]$[44, -30, 0, 30]$[44, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5KHoEeKNUa7kbzEWsw" id="(0.6666666666666666,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5aHoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_e_pr9KHoEeKNUa7kbzEWsw" type="3003" source="_e_NADKHoEeKNUa7kbzEWsw" target="_e_NAGKHoEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr9aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr9qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr96HoEeKNUa7kbzEWsw" points="[0, 0, 59, 68]$[0, -30, 59, 38]$[-59, -30, 0, 38]$[-59, -68, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX5qHoEeKNUa7kbzEWsw" id="(0.3333333333333333,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX56HoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_e_pr-KHoEeKNUa7kbzEWsw" type="3003" source="_e_NAGKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr-aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr-qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr-6HoEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7KHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7aHoEeKNUa7kbzEWsw" id="(0.2608695652173913,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_e_pr_KHoEeKNUa7kbzEWsw" type="3003" source="_e_WxAKHoEeKNUa7kbzEWsw" target="_e_NAGKHoEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_pr_aHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_e_pr_qHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_pr_6HoEeKNUa7kbzEWsw" points="[0, 0, -52, 68]$[0, -30, -52, 38]$[52, -30, 0, 38]$[52, -68, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4KHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4aHoEeKNUa7kbzEWsw" id="(0.3333333333333333,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_e_psAKHoEeKNUa7kbzEWsw" type="3003" source="_e_NASKHoEeKNUa7kbzEWsw" target="_e_NAJKHoEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_psAaHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_e_psAqHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_psA6HoEeKNUa7kbzEWsw" points="[0, 0, 54, 68]$[0, -30, 54, 38]$[-54, -30, 0, 38]$[-54, -68, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX7qHoEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX76HoEeKNUa7kbzEWsw" id="(0.6666666666666666,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_e_psBKHoEeKNUa7kbzEWsw" type="3003" source="_e_NAMKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_e_psBaHoEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_e_psBqHoEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e_psB6HoEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX4qHoEeKNUa7kbzEWsw" id="(0.49612403100775193,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fAGX46HoEeKNUa7kbzEWsw" id="(0.7364130434782609,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_hg6u0KHoEeKNUa7kbzEWsw" type="3002" source="_e_NASKHoEeKNUa7kbzEWsw" target="_hgnz4KHoEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_hg6u1KHoEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hg6u1aHoEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_hg6u1qHoEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hg6u16HoEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hg6u0aHoEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_hg6u0qHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/EStructuralFeatureAxis/element"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hg6u06HoEeKNUa7kbzEWsw" points="[-42, -20, 934, 461]$[-975, -481, 1, 0]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_kBJ28KHoEeKNUa7kbzEWsw" type="3002" source="_e_WxAKHoEeKNUa7kbzEWsw" target="_kA2U8KHoEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_kBJ29KHoEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_kBJ29aHoEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_kBJ29qHoEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_kBJ296HoEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_kBJ28aHoEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_kBJ28qHoEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/EObjectAxis/element"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kBJ286HoEeKNUa7kbzEWsw" points="[-21, -20, 460, 461]$[-480, -480, 1, 1]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_AtBlgKHpEeKNUa7kbzEWsw" type="3003" source="_e_NAJKHoEeKNUa7kbzEWsw" target="_e_NAPKHoEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_AtBlgaHpEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_AtBlgqHpEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AtBlg6HpEeKNUa7kbzEWsw" points="[39, -12, 85, 76]$[39, -97, 85, -9]$[-40, -97, 6, -9]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AtBlhKHpEeKNUa7kbzEWsw" id="(0.11764705882352941,0.3023255813953488)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Td64sKHpEeKNUa7kbzEWsw" id="(0.9836956521739131,0.8235294117647058)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_g0w-AqHpEeKNUa7kbzEWsw" type="3002" source="_e_NAJKHoEeKNUa7kbzEWsw" target="_g0n0EKHpEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_g0w-BqHpEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_g0w-B6HpEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_g0w-CKHpEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_g0w-CaHpEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_g0w-A6HpEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_g0w-BKHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/FeatureAxis/localLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g0w-BaHpEeKNUa7kbzEWsw" points="[-50, -21, 851, 350]$[-900, -371, 1, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jnSwAKHpEeKNUa7kbzEWsw" id="(0.9117647058823529,0.11627906976744186)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_hPP6kKHpEeKNUa7kbzEWsw" type="3002" source="_e_NAGKHoEeKNUa7kbzEWsw" target="_hPGwoKHpEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_hPP6lKHpEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hPP6laHpEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_hPP6lqHpEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hPP6l6HpEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hPP6kaHpEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_hPP6kqHpEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxis/ObjectAxis/localLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hPP6k6HpEeKNUa7kbzEWsw" points="[-50, 0, 317, 344]$[-367, 0, 0, 344]$[-367, -302, 0, 42]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_hPP6mKHpEeKNUa7kbzEWsw" type="3003" source="_g0n0EKHpEeKNUa7kbzEWsw" target="_hPGwoKHpEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hPP6maHpEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_hPP6mqHpEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hPP6m6HpEeKNUa7kbzEWsw" points="[-111, -39, 1091, 387]$[-1201, -426, 1, 0]"/>
-  </edges>
-</notation:Diagram>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag
deleted file mode 100644
index 0608de992ed..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattable.ecorediag" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_0KgVkKHnEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_0KgVk6HnEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_0KgVlKHnEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVlaHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVlqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVl6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_0KgVmKHnEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVmaHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVmqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVm6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVkaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISynchronizedAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVkqHnEeKNUa7kbzEWsw" x="345" y="335"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_0KgVnKHnEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_0KgVn6HnEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_0KgVoKHnEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVoaHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVoqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVo6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_0KgVpKHnEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVpaHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVpqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVp6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVnaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/EStructuralFeatureValueAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVnqHnEeKNUa7kbzEWsw" x="320" y="585" width="373"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_0KgVqKHnEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_0KgVq6HnEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_0KgVrKHnEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVraHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVrqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVr6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_0KgVsKHnEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVsaHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVsqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVs6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVqaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/SlaveObjectAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVqqHnEeKNUa7kbzEWsw" x="135" y="440"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_0KgVwKHnEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_0KgVw6HnEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_0KgVxKHnEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVxaHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVxqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVx6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_0KgVyKHnEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgVyaHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgVyqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgVy6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVwaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterEObjectAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVwqHnEeKNUa7kbzEWsw" x="535" y="475"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_0KgVzKHnEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_0KgVz6HnEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_0KgV0KHnEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KgV0aHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KgV0qHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0KgV06HnEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_0KpfgKHnEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfgaHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfgqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfg6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KgVzaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AbstractAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KgVzqHnEeKNUa7kbzEWsw" x="465" y="120"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_0KpfhKHnEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_0Kpfh6HnEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_0KpfiKHnEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfiaHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfiqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfi6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_0KpfjKHnEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfjaHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfjqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfj6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfhaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/AxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfhqHnEeKNUa7kbzEWsw" x="480" y="230"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_0KpfkKHnEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_0Kpfk6HnEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_0KpflKHnEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpflaHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpflqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfl6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_0KpfmKHnEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfmaHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfmqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfm6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfkaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/ISlaveAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfkqHnEeKNUa7kbzEWsw" x="160" y="335"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_0KpfnKHnEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_0Kpfn6HnEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_0KpfoKHnEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfoaHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfoqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfo6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_0KpfpKHnEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0KpfpaHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0KpfpqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0Kpfp6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_0KpfnaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/IMasterAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0KpfnqHnEeKNUa7kbzEWsw" x="570" y="335"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_9Ll7kKHnEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9L5dkqHnEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9L5dk6HnEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_9Ll7k6HnEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_9Ll7lKHnEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_9Ll7laHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_9Ll7lqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9Ll7l6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_9Ll7mKHnEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_9Ll7maHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_9Ll7mqHnEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9Ll7m6HnEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_9Ll7kaHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Ll7kqHnEeKNUa7kbzEWsw" x="965" y="495" height="210"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_lHzcUKHwEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_lIGXSKHwEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lIGXSaHwEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_lH9NUKHwEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_lH9NUaHwEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lH9NUqHwEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_lH9NU6HwEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lH9NVKHwEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_lH9NVaHwEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lH9NVqHwEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_lH9NV6HwEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lH9NWKHwEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_lHzcUaHwEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxis/IAxis"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lHzcUqHwEeKNUa7kbzEWsw" x="40" y="100"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_atztMKHxEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_atztM6HxEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_atztNKHxEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_atztNaHxEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_atztNqHxEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_atztN6HxEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_atztOKHxEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_atztOaHxEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_atztOqHxEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_atztO6HxEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_atztMaHxEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/MasterObjectAxisProvider"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_atztMqHxEeKNUa7kbzEWsw" x="565" y="410"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>
-  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxisprovider"/>
-  <edges xmi:type="notation:Edge" xmi:id="_0K9BgKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVkKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BgaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BgqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bg6HnEeKNUa7kbzEWsw" points="[0, 0, -91, 60]$[0, -30, -91, 30]$[91, -30, 0, 30]$[91, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZKHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZaHnEeKNUa7kbzEWsw" id="(0.39215686274509803,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_0K9BhKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_0KgVkKHnEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BhaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BhqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bh6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 171]$[0, -171, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0LsoYKHnEeKNUa7kbzEWsw" id="(0.289544235924933,0.13953488372093023)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0LsoYaHnEeKNUa7kbzEWsw" id="(0.5,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_0K9BiKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_0KgVwKHnEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BiaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BiqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bi6HnEeKNUa7kbzEWsw" points="[10, -2, 77, 64]$[10, -63, 77, 3]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3cKHnEeKNUa7kbzEWsw" id="(0.8900804289544236,0.06976744186046512)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3caHnEeKNUa7kbzEWsw" id="(0.2737430167597765,0.9411764705882353)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_0K9BjKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVqKHnEeKNUa7kbzEWsw" target="_0KpfkKHnEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0K9BjaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_0K9BjqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0K9Bj6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YqHnEeKNUa7kbzEWsw" id="(0.49760765550239233,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3Y6HnEeKNUa7kbzEWsw" id="(0.4959349593495935,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_0LGLeKHnEeKNUa7kbzEWsw" type="3003" source="_0KgVwKHnEeKNUa7kbzEWsw" target="_atztMKHxEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLeaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLeqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLe6HnEeKNUa7kbzEWsw" points="[-32, 0, 68, 59]$[-32, -24, 68, 35]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3bKHnEeKNUa7kbzEWsw" id="(0.7486033519553073,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3baHnEeKNUa7kbzEWsw" id="(0.01744186046511628,0.16279069767441862)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_0LGLfKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfhKHnEeKNUa7kbzEWsw" target="_0KgVzKHnEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLfaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLfqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLf6HnEeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3ZqHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3Z6HnEeKNUa7kbzEWsw" id="(0.49635036496350365,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_0LGLgKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfnKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLgaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLgqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLg6HnEeKNUa7kbzEWsw" points="[0, 0, 61, 70]$[0, -84, 61, -14]$[-56, -84, 5, -14]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YKHnEeKNUa7kbzEWsw" id="(0.5,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3YaHnEeKNUa7kbzEWsw" id="(0.9509803921568627,0.8604651162790697)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_0LGLhKHnEeKNUa7kbzEWsw" type="3003" source="_0KpfkKHnEeKNUa7kbzEWsw" target="_0KpfhKHnEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0LGLhaHnEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_0LGLhqHnEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0LGLh6HnEeKNUa7kbzEWsw" points="[0, 0, -278, 60]$[0, -30, -278, 30]$[278, -30, 0, 30]$[278, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3aKHnEeKNUa7kbzEWsw" id="(0.4959349593495935,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0Li3aaHnEeKNUa7kbzEWsw" id="(0.19607843137254902,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_9LvslqHnEeKNUa7kbzEWsw" type="3002" source="_0KgVnKHnEeKNUa7kbzEWsw" target="_9Ll7kKHnEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_9LvsmqHnEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9Lvsm6HnEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_9LvsnKHnEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9LvsnaHnEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_9Lvsl6HnEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_9LvsmKHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/EStructuralFeatureValueAxisProvider/listenFeature"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9LvsmaHnEeKNUa7kbzEWsw" points="[-15, -20, 416, 551]$[-430, -570, 1, 1]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_9LvsnqHnEeKNUa7kbzEWsw" type="3002" source="_0KgVwKHnEeKNUa7kbzEWsw" target="_9Ll7kKHnEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_9LvsoqHnEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9Lvso6HnEeKNUa7kbzEWsw" x="-86" y="-20"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_9L5dkKHnEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9L5dkaHnEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_9Lvsn6HnEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_9LvsoKHnEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/MasterEObjectAxisProvider/pastedElementContainmentFeature"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9LvsoaHnEeKNUa7kbzEWsw" points="[89, 21, -360, -86]$[342, 81, -107, -26]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lpCrsKHxEeKNUa7kbzEWsw" id="(0.9832402234636871,0.8627450980392157)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lRZAsKHxEeKNUa7kbzEWsw" id="(0.055299539170506916,0.08717948717948718)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_lIGXQKHwEeKNUa7kbzEWsw" type="3002" source="_0KpfhKHnEeKNUa7kbzEWsw" target="_lHzcUKHwEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_lIGXRKHwEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lIGXRaHwEeKNUa7kbzEWsw" x="9" y="-47"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_lIGXRqHwEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_lIGXR6HwEeKNUa7kbzEWsw" x="9" y="31"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_lIGXQaHwEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_lIGXQqHwEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/AxisProvider/axis"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lIGXQ6HwEeKNUa7kbzEWsw" points="[-50, 0, 257, 109]$[-307, 0, 0, 109]$[-307, -67, 0, 42]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_dhhyAKHxEeKNUa7kbzEWsw" type="3003" source="_atztMKHxEeKNUa7kbzEWsw" target="_0KpfnKHnEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_dhhyAaHxEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_dhhyAqHxEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dhhyA6HxEeKNUa7kbzEWsw" points="[-19, -20, 36, 40]$[-53, -75, 2, -15]"/>
-  </edges>
-</notation:Diagram>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag
deleted file mode 100644
index 44fd09ed8ac..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_UypeIJewEeKr0Yypv4rfLA" type="EcoreTools" name="nattableaxisconfiguration" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_3EuuMKHrEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_3E4fMKHrEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_3E4fMaHrEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fMqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fM6HrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fNKHrEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_3E4fNaHrEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fNqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fN6HrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fOKHrEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3EuuMaHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3EuuMqHrEeKNUa7kbzEWsw" x="565" y="225" height="68"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_3E4fOaHrEeKNUa7kbzEWsw" type="1005">
-    <children xmi:type="notation:Node" xmi:id="_3E4fPKHrEeKNUa7kbzEWsw" type="4010"/>
-    <children xmi:type="notation:Node" xmi:id="_3E4fPaHrEeKNUa7kbzEWsw" type="5008">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fPqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fP6HrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fQKHrEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fOqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EEnum" href="nattable.ecore#//nattableaxisconfiguration/AxisIndexStyle"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fO6HrEeKNUa7kbzEWsw" x="20" y="20"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_3E4fQaHrEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_3E4fRKHrEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_3E4fRaHrEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fRqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fR6HrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fSKHrEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_3E4fSaHrEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fSqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fS6HrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fTKHrEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fQqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fQ6HrEeKNUa7kbzEWsw" x="1050" y="345"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_3E4fWaHrEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_3E4fXKHrEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_3E4fXaHrEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fXqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fX6HrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fYKHrEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_3E4fYaHrEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fYqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fY6HrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fZKHrEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fWqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/FeatureAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fW6HrEeKNUa7kbzEWsw" x="95" y="550" width="198" height="78"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_3E4fZaHrEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_3E4faKHrEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_3E4faaHrEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4faqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fa6HrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fbKHrEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_3E4fbaHrEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fbqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fb6HrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fcKHrEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fZqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fZ6HrEeKNUa7kbzEWsw" x="855" y="235"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_3E4fcaHrEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_3E4fdKHrEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_3E4fdaHrEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fdqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fd6HrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4feKHrEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_3E4feaHrEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4feqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fe6HrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4ffKHrEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4fcqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/IAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4fc6HrEeKNUa7kbzEWsw" x="115" y="395"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_3E4ffaHrEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_3E4fgKHrEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_3E4fgaHrEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fgqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fg6HrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fhKHrEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_3E4fhaHrEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3E4fhqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3E4fh6HrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3E4fiKHrEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3E4ffqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/AxisManager"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E4ff6HrEeKNUa7kbzEWsw" x="575" y="105"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_3FCQMKHrEeKNUa7kbzEWsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_3FCQM6HrEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_3FCQNKHrEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3FCQNaHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3FCQNqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3FCQN6HrEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_3FCQOKHrEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_3FCQOaHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_3FCQOqHrEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3FCQO6HrEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_3FCQMaHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3FCQMqHrEeKNUa7kbzEWsw" x="865" y="125" width="283"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_VWNvsKHsEeKNUa7kbzEWsw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VWgqoKHsEeKNUa7kbzEWsw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VWgqoaHsEeKNUa7kbzEWsw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_VWNvs6HsEeKNUa7kbzEWsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_VWNvtKHsEeKNUa7kbzEWsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_VWNvtaHsEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_VWNvtqHsEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_VWNvt6HsEeKNUa7kbzEWsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_VWNvuKHsEeKNUa7kbzEWsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_VWNvuaHsEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_VWNvuqHsEeKNUa7kbzEWsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_VWNvu6HsEeKNUa7kbzEWsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_VWNvsaHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattablelabelprovider/AbstractLabelConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VWNvsqHsEeKNUa7kbzEWsw" x="260" y="265" width="208" height="103"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_UypeIZewEeKr0Yypv4rfLA"/>
-  <element xmi:type="ecore:EPackage" href="nattable.ecore#//nattableaxisconfiguration"/>
-  <edges xmi:type="notation:Edge" xmi:id="_3FVLIKHrEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_3E4ffaHrEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_3FVLJKHrEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLJaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_3FVLJqHrEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLJ6HrEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLIaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLIqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/axisManager"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLI6HrEeKNUa7kbzEWsw" points="[0, 0, 0, 111]$[0, -111, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBKHrEeKNUa7kbzEWsw" id="(0.4971751412429379,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBaHrEeKNUa7kbzEWsw" id="(0.49645390070921985,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_3FVLKKHrEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_3FVLLKHrEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLLaHrEeKNUa7kbzEWsw" x="-19" y="32"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_3FVLLqHrEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLL6HrEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLKaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLKqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/localSpecificConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLK6HrEeKNUa7kbzEWsw" points="[0, 21, 426, -149]$[0, 170, 426, 0]$[-412, 170, 14, 0]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BEaHrEeKNUa7kbzEWsw" id="(0.889763779527559,0.5116279069767442)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_3FVLMKHrEeKNUa7kbzEWsw" type="3002" source="_3E4fZaHrEeKNUa7kbzEWsw" target="_3EuuMKHrEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_3FVLNKHrEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLNaHrEeKNUa7kbzEWsw" x="-98" y="39"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_3FVLNqHrEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLN6HrEeKNUa7kbzEWsw" x="-2" y="14"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLMaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLMqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration/axisManagerConfigurations"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLM6HrEeKNUa7kbzEWsw" points="[0, 0, -420, 60]$[420, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDKHrEeKNUa7kbzEWsw" id="(0.7467248908296943,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDaHrEeKNUa7kbzEWsw" id="(0.903954802259887,0.45588235294117646)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_3FVLOKHrEeKNUa7kbzEWsw" type="3002" source="_3E4fQaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_3FVLPKHrEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLPaHrEeKNUa7kbzEWsw" x="-4" y="-52"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_3FVLPqHrEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FVLP6HrEeKNUa7kbzEWsw" x="3" y="-27"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLOaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLOqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration/ownedAxisConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLO6HrEeKNUa7kbzEWsw" points="[0, 9, 915, -4]$[-650, 9, 265, -4]$[-810, 9, 105, -4]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BBqHrEeKNUa7kbzEWsw" id="(0.0,0.7843137254901961)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BB6HrEeKNUa7kbzEWsw" id="(0.16535433070866143,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_3FVLQKHrEeKNUa7kbzEWsw" type="3003" source="_3FCQMKHrEeKNUa7kbzEWsw" target="_3E4fQaHrEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLQaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLQqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLQ6HrEeKNUa7kbzEWsw" points="[6, 5, -109, -279]$[6, 184, -109, -100]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCqHrEeKNUa7kbzEWsw" id="(0.7985865724381626,0.8837209302325582)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BC6HrEeKNUa7kbzEWsw" id="(0.75,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_3FVLRKHrEeKNUa7kbzEWsw" type="3003" source="_3E4fZaHrEeKNUa7kbzEWsw" target="_3E4fQaHrEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FVLRaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_3FVLRqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FVLR6HrEeKNUa7kbzEWsw" points="[0, 0, 0, 163]$[0, -163, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BDqHrEeKNUa7kbzEWsw" id="(0.4978165938864629,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BD6HrEeKNUa7kbzEWsw" id="(0.038461538461538464,0.6372549019607843)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_3FeVEKHrEeKNUa7kbzEWsw" type="3003" source="_3E4fWaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVEaHrEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVEqHrEeKNUa7kbzEWsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVE6HrEeKNUa7kbzEWsw" points="[-10, -38, 6, 122]$[-10, -152, 6, 8]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BAaHrEeKNUa7kbzEWsw" id="(0.49606299212598426,0.813953488372093)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_3FeVFKHrEeKNUa7kbzEWsw" type="3002" source="_3E4ffaHrEeKNUa7kbzEWsw" target="_3E4fcaHrEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_3FeVGKHrEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVGaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_3FeVGqHrEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVG6HrEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVFaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVFqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManager/specificAxisConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVF6HrEeKNUa7kbzEWsw" points="[-69, 0, 398, -331]$[-467, 0, 0, -331]$[-467, 290, 0, -41]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BAqHrEeKNUa7kbzEWsw" id="(0.49645390070921985,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BA6HrEeKNUa7kbzEWsw" id="(0.49606299212598426,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_3FeVHKHrEeKNUa7kbzEWsw" type="3002" source="_3FCQMKHrEeKNUa7kbzEWsw" target="_3E4ffaHrEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_3FeVIKHrEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVIaHrEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_3FeVIqHrEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_3FeVI6HrEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_3FeVHaHrEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_3FeVHqHrEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/TableHeaderAxisConfiguration/axisManagers"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3FeVH6HrEeKNUa7kbzEWsw" points="[0, 0, -180, 111]$[129, -61, -51, 50]$[180, -111, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCKHrEeKNUa7kbzEWsw" id="(0.6633165829145728,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3F7BCaHrEeKNUa7kbzEWsw" id="(0.9290780141843972,0.6666666666666666)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_VWXgsKHsEeKNUa7kbzEWsw" type="3002" source="_3E4fQaHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_VWXgtKHsEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgtaHsEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_VWXgtqHsEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgt6HsEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXgsaHsEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_VWXgsqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration/ownedLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgs6HsEeKNUa7kbzEWsw" points="[-103, -44, 856, 362]$[-958, -406, 1, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ivJfsKHsEeKNUa7kbzEWsw" id="(0.04807692307692308,0.14705882352941177)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jcYZIKHsEeKNUa7kbzEWsw" id="(0.9615384615384616,0.8640776699029126)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_VWXguKHsEeKNUa7kbzEWsw" type="3002" source="_3E4ffaHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_VWXgvKHsEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgvaHsEeKNUa7kbzEWsw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_VWXgvqHsEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgv6HsEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXguaHsEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_VWXguqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManager/headerLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgu6HsEeKNUa7kbzEWsw" points="[-69, 0, 212, -186]$[-281, 0, 0, -186]$[-281, 136, 0, -50]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_VWXgwKHsEeKNUa7kbzEWsw" type="3002" source="_3EuuMKHrEeKNUa7kbzEWsw" target="_VWNvsKHsEeKNUa7kbzEWsw">
-    <children xmi:type="notation:Node" xmi:id="_VWXgxKHsEeKNUa7kbzEWsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgxaHsEeKNUa7kbzEWsw" x="-116" y="-41"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_VWXgxqHsEeKNUa7kbzEWsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_VWXgx6HsEeKNUa7kbzEWsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_VWXgwaHsEeKNUa7kbzEWsw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_VWXgwqHsEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisconfiguration/AxisManagerConfiguration/localHeaderLabelConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VWXgw6HsEeKNUa7kbzEWsw" points="[-37, -20, 421, 236]$[-457, -256, 1, 0]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lvqqYKHsEeKNUa7kbzEWsw" id="(0.9423076923076923,0.0970873786407767)"/>
-  </edges>
-</notation:Diagram>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/plugin.pdoc b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/plugin.pdoc
deleted file mode 100644
index 3efa63544f3..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the metamodel used by the nattable editor.">
-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/plugin.properties b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/plugin.properties
deleted file mode 100644
index 5d5f67f2361..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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
-
-pluginName = Papyrus Nattable Model (Incubation)
-providerName = Eclipse Modeling Project
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/plugin.xml b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/plugin.xml
deleted file mode 100644
index 395003e1ebb..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/plugin.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- 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
--->
-
-<plugin>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated nattable -->
-      <package
-            uri="http://www.eclipse.org/papyrus/nattable/model"
-            class="org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage"
-            genModel="model/nattable.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated nattable -->
-      <package
-            uri="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"
-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage"
-            genModel="model/nattable.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated nattable -->
-      <package
-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"
-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage"
-            genModel="model/nattable.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated nattable -->
-      <package
-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"
-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage"
-            genModel="model/nattable.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated nattable -->
-      <package
-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"
-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage"
-            genModel="model/nattable.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated nattable -->
-      <package
-            uri="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"
-            class="org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage"
-            genModel="model/nattable.genmodel"/>
-   </extension>
-
-</plugin>
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java
deleted file mode 100644
index 93374afa3cd..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************
- * 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.model;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable.model"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(final BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(final BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/EObjectAxis.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/EObjectAxis.java
deleted file mode 100644
index 8166f44d14a..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/EObjectAxis.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * 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.model.nattable;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>EObject Axis</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getEObjectAxis()
- * @model
- * @generated
- */
-public interface EObjectAxis extends IAxis {
-	/**
-	 * Returns the value of the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Element</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Element</em>' reference.
-	 * @see #setElement(EObject)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getEObjectAxis_Element()
-	 * @model
-	 * @generated
-	 */
-	EObject getElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis#getElement <em>Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Element</em>' reference.
-	 * @see #getElement()
-	 * @generated
-	 */
-	void setElement(EObject value);
-
-} // EObjectAxis
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/IAxis.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/IAxis.java
deleted file mode 100644
index c87586774f9..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/IAxis.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * 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.model.nattable;
-
-import org.eclipse.emf.ecore.EModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IAxis</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getIAxis()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface IAxis extends EModelElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	Object getElement();
-
-} // IAxis
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/IdAxis.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/IdAxis.java
deleted file mode 100644
index 8e373acd3fa..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/IdAxis.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * 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.model.nattable;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Id Axis</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getIdAxis()
- * @model
- * @generated
- */
-public interface IdAxis extends IAxis {
-	/**
-	 * Returns the value of the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Element</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Element</em>' attribute.
-	 * @see #setElement(String)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getIdAxis_Element()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis#getElement <em>Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Element</em>' attribute.
-	 * @see #getElement()
-	 * @generated
-	 */
-	void setElement(String value);
-
-} // IdAxis
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
deleted file mode 100644
index 1b25b167819..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * 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.model.nattable;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage
- * @generated
- */
-public interface NattableFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	NattableFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattableFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Table</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Table</em>'.
-	 * @generated
-	 */
-	Table createTable();
-
-	/**
-	 * Returns a new object of class '<em>Id Axis</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Id Axis</em>'.
-	 * @generated
-	 */
-	IdAxis createIdAxis();
-
-	/**
-	 * Returns a new object of class '<em>EObject Axis</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>EObject Axis</em>'.
-	 * @generated
-	 */
-	EObjectAxis createEObjectAxis();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	NattablePackage getNattablePackage();
-
-} //NattableFactory
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
deleted file mode 100644
index cc5ef772e08..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
+++ /dev/null
@@ -1,575 +0,0 @@
-/**
- * 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.model.nattable;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory
- * @model kind="package"
- * @generated
- */
-public interface NattablePackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "nattable"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "nattable"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	NattablePackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl <em>Table</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getTable()
-	 * @generated
-	 */
-	int TABLE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Row Axis Provider</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE__ROW_AXIS_PROVIDER = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER;
-
-	/**
-	 * The feature id for the '<em><b>Column Axis Provider</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE__COLUMN_AXIS_PROVIDER = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER;
-
-	/**
-	 * The feature id for the '<em><b>Editor Declaration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE__EDITOR_DECLARATION = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE__NAME = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE__DESCRIPTION = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE__CONTEXT = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Editor Configuration</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE__EDITOR_CONFIGURATION = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Invert Axis</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE__INVERT_AXIS = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_FEATURE_COUNT = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of operations of the '<em>Table</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_OPERATION_COUNT = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.IAxis <em>IAxis</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.IAxis
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getIAxis()
-	 * @generated
-	 */
-	int IAXIS = 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IAXIS__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The number of structural features of the '<em>IAxis</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IAXIS_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The operation id for the '<em>Get EAnnotation</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IAXIS___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;
-
-	/**
-	 * The operation id for the '<em>Get Element</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IAXIS___GET_ELEMENT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;
-
-	/**
-	 * The number of operations of the '<em>IAxis</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IAXIS_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.IdAxisImpl <em>Id Axis</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.IdAxisImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getIdAxis()
-	 * @generated
-	 */
-	int ID_AXIS = 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ID_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ID_AXIS__ELEMENT = IAXIS_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Id Axis</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ID_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;
-
-	/**
-	 * The operation id for the '<em>Get EAnnotation</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ID_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;
-
-	/**
-	 * The operation id for the '<em>Get Element</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ID_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;
-
-	/**
-	 * The number of operations of the '<em>Id Axis</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ID_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.EObjectAxisImpl <em>EObject Axis</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.EObjectAxisImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getEObjectAxis()
-	 * @generated
-	 */
-	int EOBJECT_AXIS = 3;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EOBJECT_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EOBJECT_AXIS__ELEMENT = IAXIS_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>EObject Axis</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EOBJECT_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;
-
-	/**
-	 * The operation id for the '<em>Get EAnnotation</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EOBJECT_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;
-
-	/**
-	 * The operation id for the '<em>Get Element</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EOBJECT_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;
-
-	/**
-	 * The number of operations of the '<em>EObject Axis</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EOBJECT_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Table</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table
-	 * @generated
-	 */
-	EClass getTable();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Context</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext()
-	 * @see #getTable()
-	 * @generated
-	 */
-	EReference getTable_Context();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getEditorConfiguration <em>Editor Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Editor Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getEditorConfiguration()
-	 * @see #getTable()
-	 * @generated
-	 */
-	EReference getTable_EditorConfiguration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Invert Axis</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis()
-	 * @see #getTable()
-	 * @generated
-	 */
-	EAttribute getTable_InvertAxis();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.IAxis <em>IAxis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>IAxis</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.IAxis
-	 * @generated
-	 */
-	EClass getIAxis();
-
-	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.IAxis#getElement() <em>Get Element</em>}' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the '<em>Get Element</em>' operation.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.IAxis#getElement()
-	 * @generated
-	 */
-	EOperation getIAxis__GetElement();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis <em>Id Axis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Id Axis</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis
-	 * @generated
-	 */
-	EClass getIdAxis();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis#getElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Element</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis#getElement()
-	 * @see #getIdAxis()
-	 * @generated
-	 */
-	EAttribute getIdAxis_Element();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis <em>EObject Axis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>EObject Axis</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis
-	 * @generated
-	 */
-	EClass getEObjectAxis();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis#getElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Element</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis#getElement()
-	 * @see #getEObjectAxis()
-	 * @generated
-	 */
-	EReference getEObjectAxis_Element();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	NattableFactory getNattableFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl <em>Table</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getTable()
-		 * @generated
-		 */
-		EClass TABLE = eINSTANCE.getTable();
-
-		/**
-		 * The meta object literal for the '<em><b>Context</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TABLE__CONTEXT = eINSTANCE.getTable_Context();
-
-		/**
-		 * The meta object literal for the '<em><b>Editor Configuration</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TABLE__EDITOR_CONFIGURATION = eINSTANCE.getTable_EditorConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Invert Axis</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TABLE__INVERT_AXIS = eINSTANCE.getTable_InvertAxis();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.IAxis <em>IAxis</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.IAxis
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getIAxis()
-		 * @generated
-		 */
-		EClass IAXIS = eINSTANCE.getIAxis();
-
-		/**
-		 * The meta object literal for the '<em><b>Get Element</b></em>' operation.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EOperation IAXIS___GET_ELEMENT = eINSTANCE.getIAxis__GetElement();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.IdAxisImpl <em>Id Axis</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.IdAxisImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getIdAxis()
-		 * @generated
-		 */
-		EClass ID_AXIS = eINSTANCE.getIdAxis();
-
-		/**
-		 * The meta object literal for the '<em><b>Element</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ID_AXIS__ELEMENT = eINSTANCE.getIdAxis_Element();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.EObjectAxisImpl <em>EObject Axis</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.EObjectAxisImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getEObjectAxis()
-		 * @generated
-		 */
-		EClass EOBJECT_AXIS = eINSTANCE.getEObjectAxis();
-
-		/**
-		 * The meta object literal for the '<em><b>Element</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EOBJECT_AXIS__ELEMENT = eINSTANCE.getEObjectAxis_Element();
-
-	}
-
-} //NattablePackage
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
deleted file mode 100644
index 2c1194620f0..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * 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.model.nattable;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Table</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getEditorConfiguration <em>Editor Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable()
- * @model
- * @generated
- */
-public interface Table extends AbstractTableConfiguration {
-	/**
-	 * Returns the value of the '<em><b>Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Context</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Context</em>' reference.
-	 * @see #setContext(EObject)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Context()
-	 * @model
-	 * @generated
-	 */
-	EObject getContext();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Context</em>' reference.
-	 * @see #getContext()
-	 * @generated
-	 */
-	void setContext(EObject value);
-
-	/**
-	 * Returns the value of the '<em><b>Editor Configuration</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Editor Configuration</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Editor Configuration</em>' reference.
-	 * @see #setEditorConfiguration(TableConfiguration)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_EditorConfiguration()
-	 * @model required="true"
-	 * @generated
-	 */
-	TableConfiguration getEditorConfiguration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getEditorConfiguration <em>Editor Configuration</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Editor Configuration</em>' reference.
-	 * @see #getEditorConfiguration()
-	 * @generated
-	 */
-	void setEditorConfiguration(TableConfiguration value);
-
-	/**
-	 * Returns the value of the '<em><b>Invert Axis</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Invert Axis</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Invert Axis</em>' attribute.
-	 * @see #setInvertAxis(boolean)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_InvertAxis()
-	 * @model default="false" required="true"
-	 * @generated
-	 */
-	boolean isInvertAxis();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Invert Axis</em>' attribute.
-	 * @see #isInvertAxis()
-	 * @generated
-	 */
-	void setInvertAxis(boolean value);
-
-} // Table
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/EObjectAxisImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/EObjectAxisImpl.java
deleted file mode 100644
index 9feff4a8d5e..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/EObjectAxisImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * 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.model.nattable.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis;
-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EObject Axis</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.EObjectAxisImpl#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EObjectAxisImpl extends EModelElementImpl implements EObjectAxis {
-	/**
-	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected EObject element;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EObjectAxisImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattablePackage.Literals.EOBJECT_AXIS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject getElement() {
-		if (element != null && element.eIsProxy()) {
-			InternalEObject oldElement = (InternalEObject)element;
-			element = eResolveProxy(oldElement);
-			if (element != oldElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.EOBJECT_AXIS__ELEMENT, oldElement, element));
-			}
-		}
-		return element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject basicGetElement() {
-		return element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setElement(EObject newElement) {
-		EObject oldElement = element;
-		element = newElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.EOBJECT_AXIS__ELEMENT, oldElement, element));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NattablePackage.EOBJECT_AXIS__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NattablePackage.EOBJECT_AXIS__ELEMENT:
-				setElement((EObject)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NattablePackage.EOBJECT_AXIS__ELEMENT:
-				setElement((EObject)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NattablePackage.EOBJECT_AXIS__ELEMENT:
-				return element != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //EObjectAxisImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/IdAxisImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/IdAxisImpl.java
deleted file mode 100644
index 411f13b0bb9..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/IdAxisImpl.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * 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.model.nattable.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis;
-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Id Axis</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.IdAxisImpl#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IdAxisImpl extends EModelElementImpl implements IdAxis {
-	/**
-	 * The default value of the '{@link #getElement() <em>Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ELEMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getElement() <em>Element</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected String element = ELEMENT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IdAxisImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattablePackage.Literals.ID_AXIS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getElement() {
-		return element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setElement(String newElement) {
-		String oldElement = element;
-		element = newElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.ID_AXIS__ELEMENT, oldElement, element));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NattablePackage.ID_AXIS__ELEMENT:
-				return getElement();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NattablePackage.ID_AXIS__ELEMENT:
-				setElement((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NattablePackage.ID_AXIS__ELEMENT:
-				setElement(ELEMENT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NattablePackage.ID_AXIS__ELEMENT:
-				return ELEMENT_EDEFAULT == null ? element != null : !ELEMENT_EDEFAULT.equals(element);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (element: "); //$NON-NLS-1$
-		result.append(element);
-		result.append(')');
-		return result.toString();
-	}
-
-} //IdAxisImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
deleted file mode 100644
index 029af87301f..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * 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.model.nattable.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static NattableFactory init() {
-		try {
-			NattableFactory theNattableFactory = (NattableFactory)EPackage.Registry.INSTANCE.getEFactory(NattablePackage.eNS_URI);
-			if (theNattableFactory != null) {
-				return theNattableFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new NattableFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case NattablePackage.TABLE: return createTable();
-			case NattablePackage.ID_AXIS: return createIdAxis();
-			case NattablePackage.EOBJECT_AXIS: return createEObjectAxis();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Table createTable() {
-		TableImpl table = new TableImpl();
-		return table;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IdAxis createIdAxis() {
-		IdAxisImpl idAxis = new IdAxisImpl();
-		return idAxis;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObjectAxis createEObjectAxis() {
-		EObjectAxisImpl eObjectAxis = new EObjectAxisImpl();
-		return eObjectAxis;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattablePackage getNattablePackage() {
-		return (NattablePackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static NattablePackage getPackage() {
-		return NattablePackage.eINSTANCE;
-	}
-
-} //NattableFactoryImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
deleted file mode 100644
index a9d113c1a15..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/**
- * 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.model.nattable.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis;
-import org.eclipse.papyrus.infra.nattable.model.nattable.IAxis;
-import org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis;
-import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;
-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.NattableaxisconfigurationPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class NattablePackageImpl extends EPackageImpl implements NattablePackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass iAxisEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass idAxisEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass eObjectAxisEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private NattablePackageImpl() {
-		super(eNS_URI, NattableFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link NattablePackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static NattablePackage init() {
-		if (isInited) return (NattablePackage)EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI);
-
-		// Obtain or create and register package
-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablePackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theNattablePackage.createPackageContents();
-		theNattableconfigurationPackage.createPackageContents();
-		theNattableaxisproviderPackage.createPackageContents();
-		theNattablelabelproviderPackage.createPackageContents();
-		theNattableaxisconfigurationPackage.createPackageContents();
-		theNattabletesterPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theNattablePackage.initializePackageContents();
-		theNattableconfigurationPackage.initializePackageContents();
-		theNattableaxisproviderPackage.initializePackageContents();
-		theNattablelabelproviderPackage.initializePackageContents();
-		theNattableaxisconfigurationPackage.initializePackageContents();
-		theNattabletesterPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theNattablePackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(NattablePackage.eNS_URI, theNattablePackage);
-		return theNattablePackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTable() {
-		return tableEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTable_Context() {
-		return (EReference)tableEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTable_EditorConfiguration() {
-		return (EReference)tableEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTable_InvertAxis() {
-		return (EAttribute)tableEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIAxis() {
-		return iAxisEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EOperation getIAxis__GetElement() {
-		return iAxisEClass.getEOperations().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIdAxis() {
-		return idAxisEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getIdAxis_Element() {
-		return (EAttribute)idAxisEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEObjectAxis() {
-		return eObjectAxisEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEObjectAxis_Element() {
-		return (EReference)eObjectAxisEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableFactory getNattableFactory() {
-		return (NattableFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		tableEClass = createEClass(TABLE);
-		createEReference(tableEClass, TABLE__CONTEXT);
-		createEReference(tableEClass, TABLE__EDITOR_CONFIGURATION);
-		createEAttribute(tableEClass, TABLE__INVERT_AXIS);
-
-		iAxisEClass = createEClass(IAXIS);
-		createEOperation(iAxisEClass, IAXIS___GET_ELEMENT);
-
-		idAxisEClass = createEClass(ID_AXIS);
-		createEAttribute(idAxisEClass, ID_AXIS__ELEMENT);
-
-		eObjectAxisEClass = createEClass(EOBJECT_AXIS);
-		createEReference(eObjectAxisEClass, EOBJECT_AXIS__ELEMENT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		NattableconfigurationPackage theNattableconfigurationPackage = (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
-		NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);
-		NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
-		NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
-		NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Add subpackages
-		getESubpackages().add(theNattableconfigurationPackage);
-		getESubpackages().add(theNattableaxisproviderPackage);
-		getESubpackages().add(theNattablelabelproviderPackage);
-		getESubpackages().add(theNattableaxisconfigurationPackage);
-		getESubpackages().add(theNattabletesterPackage);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		tableEClass.getESuperTypes().add(theNattableconfigurationPackage.getAbstractTableConfiguration());
-		iAxisEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
-		idAxisEClass.getESuperTypes().add(this.getIAxis());
-		eObjectAxisEClass.getESuperTypes().add(this.getIAxis());
-
-		// Initialize classes, features, and operations; add parameters
-		initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getTable_Context(), ecorePackage.getEObject(), null, "context", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getTable_EditorConfiguration(), theNattableconfigurationPackage.getTableConfiguration(), null, "editorConfiguration", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getTable_InvertAxis(), theEcorePackage.getEBoolean(), "invertAxis", "false", 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(iAxisEClass, IAxis.class, "IAxis", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEOperation(getIAxis__GetElement(), ecorePackage.getEJavaObject(), "getElement", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(idAxisEClass, IdAxis.class, "IdAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getIdAxis_Element(), ecorePackage.getEString(), "element", null, 1, 1, IdAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(eObjectAxisEClass, EObjectAxis.class, "EObjectAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getEObjectAxis_Element(), theEcorePackage.getEObject(), null, "element", null, 0, 1, EObjectAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //NattablePackageImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
deleted file mode 100644
index afcce26802f..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/**
- * 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.model.nattable.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-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.nattableconfiguration.TableConfiguration;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableConfigurationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Table</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getContext <em>Context</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getEditorConfiguration <em>Editor Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#isInvertAxis <em>Invert Axis</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TableImpl extends AbstractTableConfigurationImpl implements Table {
-	/**
-	 * The cached value of the '{@link #getContext() <em>Context</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContext()
-	 * @generated
-	 * @ordered
-	 */
-	protected EObject context;
-
-	/**
-	 * The cached value of the '{@link #getEditorConfiguration() <em>Editor Configuration</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEditorConfiguration()
-	 * @generated
-	 * @ordered
-	 */
-	protected TableConfiguration editorConfiguration;
-
-	/**
-	 * The default value of the '{@link #isInvertAxis() <em>Invert Axis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isInvertAxis()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean INVERT_AXIS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isInvertAxis() <em>Invert Axis</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isInvertAxis()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean invertAxis = INVERT_AXIS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TableImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattablePackage.Literals.TABLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject getContext() {
-		if (context != null && context.eIsProxy()) {
-			InternalEObject oldContext = (InternalEObject)context;
-			context = eResolveProxy(oldContext);
-			if (context != oldContext) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__CONTEXT, oldContext, context));
-			}
-		}
-		return context;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject basicGetContext() {
-		return context;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContext(EObject newContext) {
-		EObject oldContext = context;
-		context = newContext;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__CONTEXT, oldContext, context));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TableConfiguration getEditorConfiguration() {
-		if (editorConfiguration != null && editorConfiguration.eIsProxy()) {
-			InternalEObject oldEditorConfiguration = (InternalEObject)editorConfiguration;
-			editorConfiguration = (TableConfiguration)eResolveProxy(oldEditorConfiguration);
-			if (editorConfiguration != oldEditorConfiguration) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__EDITOR_CONFIGURATION, oldEditorConfiguration, editorConfiguration));
-			}
-		}
-		return editorConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TableConfiguration basicGetEditorConfiguration() {
-		return editorConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEditorConfiguration(TableConfiguration newEditorConfiguration) {
-		TableConfiguration oldEditorConfiguration = editorConfiguration;
-		editorConfiguration = newEditorConfiguration;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__EDITOR_CONFIGURATION, oldEditorConfiguration, editorConfiguration));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isInvertAxis() {
-		return invertAxis;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInvertAxis(boolean newInvertAxis) {
-		boolean oldInvertAxis = invertAxis;
-		invertAxis = newInvertAxis;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__INVERT_AXIS, oldInvertAxis, invertAxis));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NattablePackage.TABLE__CONTEXT:
-				if (resolve) return getContext();
-				return basicGetContext();
-			case NattablePackage.TABLE__EDITOR_CONFIGURATION:
-				if (resolve) return getEditorConfiguration();
-				return basicGetEditorConfiguration();
-			case NattablePackage.TABLE__INVERT_AXIS:
-				return isInvertAxis();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NattablePackage.TABLE__CONTEXT:
-				setContext((EObject)newValue);
-				return;
-			case NattablePackage.TABLE__EDITOR_CONFIGURATION:
-				setEditorConfiguration((TableConfiguration)newValue);
-				return;
-			case NattablePackage.TABLE__INVERT_AXIS:
-				setInvertAxis((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NattablePackage.TABLE__CONTEXT:
-				setContext((EObject)null);
-				return;
-			case NattablePackage.TABLE__EDITOR_CONFIGURATION:
-				setEditorConfiguration((TableConfiguration)null);
-				return;
-			case NattablePackage.TABLE__INVERT_AXIS:
-				setInvertAxis(INVERT_AXIS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NattablePackage.TABLE__CONTEXT:
-				return context != null;
-			case NattablePackage.TABLE__EDITOR_CONFIGURATION:
-				return editorConfiguration != null;
-			case NattablePackage.TABLE__INVERT_AXIS:
-				return invertAxis != INVERT_AXIS_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (invertAxis: "); //$NON-NLS-1$
-		result.append(invertAxis);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TableImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractAxisConfiguration.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractAxisConfiguration.java
deleted file mode 100644
index d9b6184049e..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractAxisConfiguration.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisconfiguration;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Axis Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractAxisConfiguration#getLabelConfiguration <em>Label Configuration</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractAxisConfiguration()
- * @model
- * @generated
- */
-public interface AbstractAxisConfiguration extends EModelElement {
-	/**
-	 * Returns the value of the '<em><b>Label Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Label Configuration</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Label Configuration</em>' containment reference.
-	 * @see #setLabelConfiguration(ILabelConfiguration)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractAxisConfiguration_LabelConfiguration()
-	 * @model containment="true"
-	 * @generated
-	 */
-	ILabelConfiguration getLabelConfiguration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractAxisConfiguration#getLabelConfiguration <em>Label Configuration</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Label Configuration</em>' containment reference.
-	 * @see #getLabelConfiguration()
-	 * @generated
-	 */
-	void setLabelConfiguration(ILabelConfiguration value);
-
-} // AbstractAxisConfiguration
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java
deleted file mode 100644
index d67c9aea850..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisconfiguration;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Axis Index Style</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisIndexStyle()
- * @model
- * @generated
- */
-public enum AxisIndexStyle implements Enumerator {
-	/**
-	 * The '<em><b>NUMERIC</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NUMERIC_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NUMERIC(0, "NUMERIC", "NUMERIC"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>ALPHABETIC</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ALPHABETIC_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ALPHABETIC(1, "ALPHABETIC", "ALPHABETIC"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>NUMERIC</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NUMERIC</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NUMERIC
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NUMERIC_VALUE = 0;
-
-	/**
-	 * The '<em><b>ALPHABETIC</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ALPHABETIC</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ALPHABETIC
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ALPHABETIC_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>Axis Index Style</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final AxisIndexStyle[] VALUES_ARRAY =
-		new AxisIndexStyle[] {
-			NUMERIC,
-			ALPHABETIC,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Axis Index Style</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<AxisIndexStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AxisIndexStyle get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AxisIndexStyle result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AxisIndexStyle getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AxisIndexStyle result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AxisIndexStyle get(int value) {
-		switch (value) {
-			case NUMERIC_VALUE: return NUMERIC;
-			case ALPHABETIC_VALUE: return ALPHABETIC;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private AxisIndexStyle(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //AxisIndexStyle
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/DefaultAxisConfiguration.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/DefaultAxisConfiguration.java
deleted file mode 100644
index 4d0cfefe930..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/DefaultAxisConfiguration.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisconfiguration;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Default Axis Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#getIndexStyle <em>Index Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#isDisplayLabel <em>Display Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#isDisplayFilter <em>Display Filter</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#isDisplayIndex <em>Display Index</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getDefaultAxisConfiguration()
- * @model
- * @generated
- */
-public interface DefaultAxisConfiguration extends AbstractAxisConfiguration {
-	/**
-	 * Returns the value of the '<em><b>Index Style</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Index Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Index Style</em>' attribute.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle
-	 * @see #setIndexStyle(AxisIndexStyle)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getDefaultAxisConfiguration_IndexStyle()
-	 * @model required="true"
-	 * @generated
-	 */
-	AxisIndexStyle getIndexStyle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#getIndexStyle <em>Index Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Index Style</em>' attribute.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle
-	 * @see #getIndexStyle()
-	 * @generated
-	 */
-	void setIndexStyle(AxisIndexStyle value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Index</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Index</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Index</em>' attribute.
-	 * @see #setDisplayIndex(boolean)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getDefaultAxisConfiguration_DisplayIndex()
-	 * @model default="true" required="true"
-	 * @generated
-	 */
-	boolean isDisplayIndex();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#isDisplayIndex <em>Display Index</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Index</em>' attribute.
-	 * @see #isDisplayIndex()
-	 * @generated
-	 */
-	void setDisplayIndex(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Label</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Label</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Label</em>' attribute.
-	 * @see #setDisplayLabel(boolean)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getDefaultAxisConfiguration_DisplayLabel()
-	 * @model default="true" required="true"
-	 * @generated
-	 */
-	boolean isDisplayLabel();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#isDisplayLabel <em>Display Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Label</em>' attribute.
-	 * @see #isDisplayLabel()
-	 * @generated
-	 */
-	void setDisplayLabel(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Filter</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Filter</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Filter</em>' attribute.
-	 * @see #setDisplayFilter(boolean)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getDefaultAxisConfiguration_DisplayFilter()
-	 * @model default="false" required="true"
-	 * @generated
-	 */
-	boolean isDisplayFilter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#isDisplayFilter <em>Display Filter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Filter</em>' attribute.
-	 * @see #isDisplayFilter()
-	 * @generated
-	 */
-	void setDisplayFilter(boolean value);
-
-} // DefaultAxisConfiguration
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java
deleted file mode 100644
index c714ae0be21..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisconfiguration;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage
- * @generated
- */
-public interface NattableaxisconfigurationFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	NattableaxisconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Abstract Axis Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Abstract Axis Configuration</em>'.
-	 * @generated
-	 */
-	AbstractAxisConfiguration createAbstractAxisConfiguration();
-
-	/**
-	 * Returns a new object of class '<em>Default Axis Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Default Axis Configuration</em>'.
-	 * @generated
-	 */
-	DefaultAxisConfiguration createDefaultAxisConfiguration();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	NattableaxisconfigurationPackage getNattableaxisconfigurationPackage();
-
-} //NattableaxisconfigurationFactory
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
deleted file mode 100644
index 1bc6c149aa7..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisconfiguration;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory
- * @model kind="package"
- * @generated
- */
-public interface NattableaxisconfigurationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "nattableaxisconfiguration"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "nattableaxisconfiguration"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	NattableaxisconfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractAxisConfigurationImpl <em>Abstract Axis Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractAxisConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAbstractAxisConfiguration()
-	 * @generated
-	 */
-	int ABSTRACT_AXIS_CONFIGURATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_CONFIGURATION__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Label Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_CONFIGURATION__LABEL_CONFIGURATION = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Abstract Axis Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_CONFIGURATION_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The operation id for the '<em>Get EAnnotation</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_CONFIGURATION___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;
-
-	/**
-	 * The number of operations of the '<em>Abstract Axis Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_CONFIGURATION_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.DefaultAxisConfigurationImpl <em>Default Axis Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.DefaultAxisConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getDefaultAxisConfiguration()
-	 * @generated
-	 */
-	int DEFAULT_AXIS_CONFIGURATION = 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_CONFIGURATION__EANNOTATIONS = ABSTRACT_AXIS_CONFIGURATION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Label Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_CONFIGURATION__LABEL_CONFIGURATION = ABSTRACT_AXIS_CONFIGURATION__LABEL_CONFIGURATION;
-
-	/**
-	 * The feature id for the '<em><b>Index Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_CONFIGURATION__INDEX_STYLE = ABSTRACT_AXIS_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Label</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_CONFIGURATION__DISPLAY_LABEL = ABSTRACT_AXIS_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Display Filter</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_CONFIGURATION__DISPLAY_FILTER = ABSTRACT_AXIS_CONFIGURATION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Display Index</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_CONFIGURATION__DISPLAY_INDEX = ABSTRACT_AXIS_CONFIGURATION_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Default Axis Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_CONFIGURATION_FEATURE_COUNT = ABSTRACT_AXIS_CONFIGURATION_FEATURE_COUNT + 4;
-
-	/**
-	 * The operation id for the '<em>Get EAnnotation</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_CONFIGURATION___GET_EANNOTATION__STRING = ABSTRACT_AXIS_CONFIGURATION___GET_EANNOTATION__STRING;
-
-	/**
-	 * The number of operations of the '<em>Default Axis Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_CONFIGURATION_OPERATION_COUNT = ABSTRACT_AXIS_CONFIGURATION_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle <em>Axis Index Style</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAxisIndexStyle()
-	 * @generated
-	 */
-	int AXIS_INDEX_STYLE = 2;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractAxisConfiguration <em>Abstract Axis Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract Axis Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractAxisConfiguration
-	 * @generated
-	 */
-	EClass getAbstractAxisConfiguration();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractAxisConfiguration#getLabelConfiguration <em>Label Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Label Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractAxisConfiguration#getLabelConfiguration()
-	 * @see #getAbstractAxisConfiguration()
-	 * @generated
-	 */
-	EReference getAbstractAxisConfiguration_LabelConfiguration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration <em>Default Axis Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Default Axis Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration
-	 * @generated
-	 */
-	EClass getDefaultAxisConfiguration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#getIndexStyle <em>Index Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Index Style</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#getIndexStyle()
-	 * @see #getDefaultAxisConfiguration()
-	 * @generated
-	 */
-	EAttribute getDefaultAxisConfiguration_IndexStyle();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#isDisplayIndex <em>Display Index</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Index</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#isDisplayIndex()
-	 * @see #getDefaultAxisConfiguration()
-	 * @generated
-	 */
-	EAttribute getDefaultAxisConfiguration_DisplayIndex();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#isDisplayLabel <em>Display Label</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Label</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#isDisplayLabel()
-	 * @see #getDefaultAxisConfiguration()
-	 * @generated
-	 */
-	EAttribute getDefaultAxisConfiguration_DisplayLabel();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#isDisplayFilter <em>Display Filter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Filter</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration#isDisplayFilter()
-	 * @see #getDefaultAxisConfiguration()
-	 * @generated
-	 */
-	EAttribute getDefaultAxisConfiguration_DisplayFilter();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle <em>Axis Index Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Axis Index Style</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle
-	 * @generated
-	 */
-	EEnum getAxisIndexStyle();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	NattableaxisconfigurationFactory getNattableaxisconfigurationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractAxisConfigurationImpl <em>Abstract Axis Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractAxisConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAbstractAxisConfiguration()
-		 * @generated
-		 */
-		EClass ABSTRACT_AXIS_CONFIGURATION = eINSTANCE.getAbstractAxisConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Label Configuration</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ABSTRACT_AXIS_CONFIGURATION__LABEL_CONFIGURATION = eINSTANCE.getAbstractAxisConfiguration_LabelConfiguration();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.DefaultAxisConfigurationImpl <em>Default Axis Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.DefaultAxisConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getDefaultAxisConfiguration()
-		 * @generated
-		 */
-		EClass DEFAULT_AXIS_CONFIGURATION = eINSTANCE.getDefaultAxisConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Index Style</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DEFAULT_AXIS_CONFIGURATION__INDEX_STYLE = eINSTANCE.getDefaultAxisConfiguration_IndexStyle();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Index</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DEFAULT_AXIS_CONFIGURATION__DISPLAY_INDEX = eINSTANCE.getDefaultAxisConfiguration_DisplayIndex();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Label</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DEFAULT_AXIS_CONFIGURATION__DISPLAY_LABEL = eINSTANCE.getDefaultAxisConfiguration_DisplayLabel();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Filter</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DEFAULT_AXIS_CONFIGURATION__DISPLAY_FILTER = eINSTANCE.getDefaultAxisConfiguration_DisplayFilter();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle <em>Axis Index Style</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl#getAxisIndexStyle()
-		 * @generated
-		 */
-		EEnum AXIS_INDEX_STYLE = eINSTANCE.getAxisIndexStyle();
-
-	}
-
-} //NattableaxisconfigurationPackage
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractAxisConfigurationImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractAxisConfigurationImpl.java
deleted file mode 100644
index 591779654d0..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractAxisConfigurationImpl.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisconfiguration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractAxisConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Axis Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AbstractAxisConfigurationImpl#getLabelConfiguration <em>Label Configuration</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AbstractAxisConfigurationImpl extends EModelElementImpl implements AbstractAxisConfiguration {
-	/**
-	 * The cached value of the '{@link #getLabelConfiguration() <em>Label Configuration</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLabelConfiguration()
-	 * @generated
-	 * @ordered
-	 */
-	protected ILabelConfiguration labelConfiguration;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractAxisConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattableaxisconfigurationPackage.Literals.ABSTRACT_AXIS_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ILabelConfiguration getLabelConfiguration() {
-		return labelConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLabelConfiguration(ILabelConfiguration newLabelConfiguration, NotificationChain msgs) {
-		ILabelConfiguration oldLabelConfiguration = labelConfiguration;
-		labelConfiguration = newLabelConfiguration;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_AXIS_CONFIGURATION__LABEL_CONFIGURATION, oldLabelConfiguration, newLabelConfiguration);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLabelConfiguration(ILabelConfiguration newLabelConfiguration) {
-		if (newLabelConfiguration != labelConfiguration) {
-			NotificationChain msgs = null;
-			if (labelConfiguration != null)
-				msgs = ((InternalEObject)labelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.ABSTRACT_AXIS_CONFIGURATION__LABEL_CONFIGURATION, null, msgs);
-			if (newLabelConfiguration != null)
-				msgs = ((InternalEObject)newLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisconfigurationPackage.ABSTRACT_AXIS_CONFIGURATION__LABEL_CONFIGURATION, null, msgs);
-			msgs = basicSetLabelConfiguration(newLabelConfiguration, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.ABSTRACT_AXIS_CONFIGURATION__LABEL_CONFIGURATION, newLabelConfiguration, newLabelConfiguration));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case NattableaxisconfigurationPackage.ABSTRACT_AXIS_CONFIGURATION__LABEL_CONFIGURATION:
-				return basicSetLabelConfiguration(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NattableaxisconfigurationPackage.ABSTRACT_AXIS_CONFIGURATION__LABEL_CONFIGURATION:
-				return getLabelConfiguration();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NattableaxisconfigurationPackage.ABSTRACT_AXIS_CONFIGURATION__LABEL_CONFIGURATION:
-				setLabelConfiguration((ILabelConfiguration)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NattableaxisconfigurationPackage.ABSTRACT_AXIS_CONFIGURATION__LABEL_CONFIGURATION:
-				setLabelConfiguration((ILabelConfiguration)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NattableaxisconfigurationPackage.ABSTRACT_AXIS_CONFIGURATION__LABEL_CONFIGURATION:
-				return labelConfiguration != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //AbstractAxisConfigurationImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/DefaultAxisConfigurationImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/DefaultAxisConfigurationImpl.java
deleted file mode 100644
index 15ec8279d97..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/DefaultAxisConfigurationImpl.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisconfiguration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Default Axis Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.DefaultAxisConfigurationImpl#getIndexStyle <em>Index Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.DefaultAxisConfigurationImpl#isDisplayLabel <em>Display Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.DefaultAxisConfigurationImpl#isDisplayFilter <em>Display Filter</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.DefaultAxisConfigurationImpl#isDisplayIndex <em>Display Index</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DefaultAxisConfigurationImpl extends AbstractAxisConfigurationImpl implements DefaultAxisConfiguration {
-	/**
-	 * The default value of the '{@link #getIndexStyle() <em>Index Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndexStyle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final AxisIndexStyle INDEX_STYLE_EDEFAULT = AxisIndexStyle.NUMERIC;
-
-	/**
-	 * The cached value of the '{@link #getIndexStyle() <em>Index Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndexStyle()
-	 * @generated
-	 * @ordered
-	 */
-	protected AxisIndexStyle indexStyle = INDEX_STYLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayLabel()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DISPLAY_LABEL_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayLabel()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean displayLabel = DISPLAY_LABEL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDisplayFilter() <em>Display Filter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayFilter()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DISPLAY_FILTER_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isDisplayFilter() <em>Display Filter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayFilter()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean displayFilter = DISPLAY_FILTER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDisplayIndex() <em>Display Index</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayIndex()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DISPLAY_INDEX_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isDisplayIndex() <em>Display Index</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayIndex()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean displayIndex = DISPLAY_INDEX_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DefaultAxisConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattableaxisconfigurationPackage.Literals.DEFAULT_AXIS_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AxisIndexStyle getIndexStyle() {
-		return indexStyle;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIndexStyle(AxisIndexStyle newIndexStyle) {
-		AxisIndexStyle oldIndexStyle = indexStyle;
-		indexStyle = newIndexStyle == null ? INDEX_STYLE_EDEFAULT : newIndexStyle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__INDEX_STYLE, oldIndexStyle, indexStyle));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDisplayIndex() {
-		return displayIndex;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayIndex(boolean newDisplayIndex) {
-		boolean oldDisplayIndex = displayIndex;
-		displayIndex = newDisplayIndex;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_INDEX, oldDisplayIndex, displayIndex));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDisplayLabel() {
-		return displayLabel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayLabel(boolean newDisplayLabel) {
-		boolean oldDisplayLabel = displayLabel;
-		displayLabel = newDisplayLabel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_LABEL, oldDisplayLabel, displayLabel));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDisplayFilter() {
-		return displayFilter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayFilter(boolean newDisplayFilter) {
-		boolean oldDisplayFilter = displayFilter;
-		displayFilter = newDisplayFilter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_FILTER, oldDisplayFilter, displayFilter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__INDEX_STYLE:
-				return getIndexStyle();
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_LABEL:
-				return isDisplayLabel();
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_FILTER:
-				return isDisplayFilter();
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_INDEX:
-				return isDisplayIndex();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__INDEX_STYLE:
-				setIndexStyle((AxisIndexStyle)newValue);
-				return;
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_LABEL:
-				setDisplayLabel((Boolean)newValue);
-				return;
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_FILTER:
-				setDisplayFilter((Boolean)newValue);
-				return;
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_INDEX:
-				setDisplayIndex((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__INDEX_STYLE:
-				setIndexStyle(INDEX_STYLE_EDEFAULT);
-				return;
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_LABEL:
-				setDisplayLabel(DISPLAY_LABEL_EDEFAULT);
-				return;
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_FILTER:
-				setDisplayFilter(DISPLAY_FILTER_EDEFAULT);
-				return;
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_INDEX:
-				setDisplayIndex(DISPLAY_INDEX_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__INDEX_STYLE:
-				return indexStyle != INDEX_STYLE_EDEFAULT;
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_LABEL:
-				return displayLabel != DISPLAY_LABEL_EDEFAULT;
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_FILTER:
-				return displayFilter != DISPLAY_FILTER_EDEFAULT;
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION__DISPLAY_INDEX:
-				return displayIndex != DISPLAY_INDEX_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (indexStyle: "); //$NON-NLS-1$
-		result.append(indexStyle);
-		result.append(", displayLabel: "); //$NON-NLS-1$
-		result.append(displayLabel);
-		result.append(", displayFilter: "); //$NON-NLS-1$
-		result.append(displayFilter);
-		result.append(", displayIndex: "); //$NON-NLS-1$
-		result.append(displayIndex);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DefaultAxisConfigurationImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java
deleted file mode 100644
index 08b5c8c549f..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class NattableaxisconfigurationFactoryImpl extends EFactoryImpl implements NattableaxisconfigurationFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static NattableaxisconfigurationFactory init() {
-		try {
-			NattableaxisconfigurationFactory theNattableaxisconfigurationFactory = (NattableaxisconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisconfigurationPackage.eNS_URI);
-			if (theNattableaxisconfigurationFactory != null) {
-				return theNattableaxisconfigurationFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new NattableaxisconfigurationFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableaxisconfigurationFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case NattableaxisconfigurationPackage.ABSTRACT_AXIS_CONFIGURATION: return createAbstractAxisConfiguration();
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION: return createDefaultAxisConfiguration();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:
-				return createAxisIndexStyleFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:
-				return convertAxisIndexStyleToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractAxisConfiguration createAbstractAxisConfiguration() {
-		AbstractAxisConfigurationImpl abstractAxisConfiguration = new AbstractAxisConfigurationImpl();
-		return abstractAxisConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DefaultAxisConfiguration createDefaultAxisConfiguration() {
-		DefaultAxisConfigurationImpl defaultAxisConfiguration = new DefaultAxisConfigurationImpl();
-		return defaultAxisConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AxisIndexStyle createAxisIndexStyleFromString(EDataType eDataType, String initialValue) {
-		AxisIndexStyle result = AxisIndexStyle.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertAxisIndexStyleToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableaxisconfigurationPackage getNattableaxisconfigurationPackage() {
-		return (NattableaxisconfigurationPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static NattableaxisconfigurationPackage getPackage() {
-		return NattableaxisconfigurationPackage.eINSTANCE;
-	}
-
-} //NattableaxisconfigurationFactoryImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
deleted file mode 100644
index 1ce87d42aa2..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisconfiguration.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractAxisConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration;
-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.nattableaxisprovider.NattableaxisproviderPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class NattableaxisconfigurationPackageImpl extends EPackageImpl implements NattableaxisconfigurationPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass abstractAxisConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass defaultAxisConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum axisIndexStyleEEnum = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private NattableaxisconfigurationPackageImpl() {
-		super(eNS_URI, NattableaxisconfigurationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link NattableaxisconfigurationPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static NattableaxisconfigurationPackage init() {
-		if (isInited) return (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
-
-		// Obtain or create and register package
-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisconfigurationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theNattableaxisconfigurationPackage.createPackageContents();
-		theNattablePackage.createPackageContents();
-		theNattableconfigurationPackage.createPackageContents();
-		theNattableaxisproviderPackage.createPackageContents();
-		theNattablelabelproviderPackage.createPackageContents();
-		theNattabletesterPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theNattableaxisconfigurationPackage.initializePackageContents();
-		theNattablePackage.initializePackageContents();
-		theNattableconfigurationPackage.initializePackageContents();
-		theNattableaxisproviderPackage.initializePackageContents();
-		theNattablelabelproviderPackage.initializePackageContents();
-		theNattabletesterPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theNattableaxisconfigurationPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(NattableaxisconfigurationPackage.eNS_URI, theNattableaxisconfigurationPackage);
-		return theNattableaxisconfigurationPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAbstractAxisConfiguration() {
-		return abstractAxisConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAbstractAxisConfiguration_LabelConfiguration() {
-		return (EReference)abstractAxisConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDefaultAxisConfiguration() {
-		return defaultAxisConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDefaultAxisConfiguration_IndexStyle() {
-		return (EAttribute)defaultAxisConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDefaultAxisConfiguration_DisplayIndex() {
-		return (EAttribute)defaultAxisConfigurationEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDefaultAxisConfiguration_DisplayLabel() {
-		return (EAttribute)defaultAxisConfigurationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDefaultAxisConfiguration_DisplayFilter() {
-		return (EAttribute)defaultAxisConfigurationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getAxisIndexStyle() {
-		return axisIndexStyleEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableaxisconfigurationFactory getNattableaxisconfigurationFactory() {
-		return (NattableaxisconfigurationFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		abstractAxisConfigurationEClass = createEClass(ABSTRACT_AXIS_CONFIGURATION);
-		createEReference(abstractAxisConfigurationEClass, ABSTRACT_AXIS_CONFIGURATION__LABEL_CONFIGURATION);
-
-		defaultAxisConfigurationEClass = createEClass(DEFAULT_AXIS_CONFIGURATION);
-		createEAttribute(defaultAxisConfigurationEClass, DEFAULT_AXIS_CONFIGURATION__INDEX_STYLE);
-		createEAttribute(defaultAxisConfigurationEClass, DEFAULT_AXIS_CONFIGURATION__DISPLAY_LABEL);
-		createEAttribute(defaultAxisConfigurationEClass, DEFAULT_AXIS_CONFIGURATION__DISPLAY_FILTER);
-		createEAttribute(defaultAxisConfigurationEClass, DEFAULT_AXIS_CONFIGURATION__DISPLAY_INDEX);
-
-		// Create enums
-		axisIndexStyleEEnum = createEEnum(AXIS_INDEX_STYLE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-		NattablelabelproviderPackage theNattablelabelproviderPackage = (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		abstractAxisConfigurationEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
-		defaultAxisConfigurationEClass.getESuperTypes().add(this.getAbstractAxisConfiguration());
-
-		// Initialize classes, features, and operations; add parameters
-		initEClass(abstractAxisConfigurationEClass, AbstractAxisConfiguration.class, "AbstractAxisConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getAbstractAxisConfiguration_LabelConfiguration(), theNattablelabelproviderPackage.getILabelConfiguration(), null, "labelConfiguration", null, 0, 1, AbstractAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(defaultAxisConfigurationEClass, DefaultAxisConfiguration.class, "DefaultAxisConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getDefaultAxisConfiguration_IndexStyle(), this.getAxisIndexStyle(), "indexStyle", null, 1, 1, DefaultAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getDefaultAxisConfiguration_DisplayLabel(), theEcorePackage.getEBoolean(), "displayLabel", "true", 1, 1, DefaultAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getDefaultAxisConfiguration_DisplayFilter(), theEcorePackage.getEBoolean(), "displayFilter", "false", 1, 1, DefaultAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getDefaultAxisConfiguration_DisplayIndex(), theEcorePackage.getEBoolean(), "displayIndex", "true", 1, 1, DefaultAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		// Initialize enums and add enum literals
-		initEEnum(axisIndexStyleEEnum, AxisIndexStyle.class, "AxisIndexStyle"); //$NON-NLS-1$
-		addEEnumLiteral(axisIndexStyleEEnum, AxisIndexStyle.NUMERIC);
-		addEEnumLiteral(axisIndexStyleEEnum, AxisIndexStyle.ALPHABETIC);
-	}
-
-} //NattableaxisconfigurationPackageImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java
deleted file mode 100644
index 8766ce0620f..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisconfiguration.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage
- * @generated
- */
-public class NattableaxisconfigurationAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static NattableaxisconfigurationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableaxisconfigurationAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = NattableaxisconfigurationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NattableaxisconfigurationSwitch<Adapter> modelSwitch =
-		new NattableaxisconfigurationSwitch<Adapter>() {
-			@Override
-			public Adapter caseAbstractAxisConfiguration(AbstractAxisConfiguration object) {
-				return createAbstractAxisConfigurationAdapter();
-			}
-			@Override
-			public Adapter caseDefaultAxisConfiguration(DefaultAxisConfiguration object) {
-				return createDefaultAxisConfigurationAdapter();
-			}
-			@Override
-			public Adapter caseEModelElement(EModelElement object) {
-				return createEModelElementAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractAxisConfiguration <em>Abstract Axis Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractAxisConfiguration
-	 * @generated
-	 */
-	public Adapter createAbstractAxisConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration <em>Default Axis Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration
-	 * @generated
-	 */
-	public Adapter createDefaultAxisConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EModelElement
-	 * @generated
-	 */
-	public Adapter createEModelElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //NattableaxisconfigurationAdapterFactory
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java
deleted file mode 100644
index cf9567b1df1..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisconfiguration.util;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage
- * @generated
- */
-public class NattableaxisconfigurationSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static NattableaxisconfigurationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableaxisconfigurationSwitch() {
-		if (modelPackage == null) {
-			modelPackage = NattableaxisconfigurationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case NattableaxisconfigurationPackage.ABSTRACT_AXIS_CONFIGURATION: {
-				AbstractAxisConfiguration abstractAxisConfiguration = (AbstractAxisConfiguration)theEObject;
-				T result = caseAbstractAxisConfiguration(abstractAxisConfiguration);
-				if (result == null) result = caseEModelElement(abstractAxisConfiguration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NattableaxisconfigurationPackage.DEFAULT_AXIS_CONFIGURATION: {
-				DefaultAxisConfiguration defaultAxisConfiguration = (DefaultAxisConfiguration)theEObject;
-				T result = caseDefaultAxisConfiguration(defaultAxisConfiguration);
-				if (result == null) result = caseAbstractAxisConfiguration(defaultAxisConfiguration);
-				if (result == null) result = caseEModelElement(defaultAxisConfiguration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Axis Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Abstract Axis Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAbstractAxisConfiguration(AbstractAxisConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Default Axis Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Default Axis Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDefaultAxisConfiguration(DefaultAxisConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEModelElement(EModelElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //NattableaxisconfigurationSwitch
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
deleted file mode 100644
index 7c244811279..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisprovider;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.infra.nattable.model.nattable.IAxis;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractAxisConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Axis Provider</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getJavaAxisManagerIds <em>Java Axis Manager Ids</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxisConfiguration <em>Axis Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getPastedElementTypeId <em>Pasted Element Type Id</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getPastedElementContainmentFeature <em>Pasted Element Containment Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAlias <em>Alias</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAbstractAxisProvider()
- * @model abstract="true"
- * @generated
- */
-public interface AbstractAxisProvider extends EModelElement {
-	/**
-	 * Returns the value of the '<em><b>Java Axis Manager Ids</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Java Axis Manager Ids</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Java Axis Manager Ids</em>' attribute list.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAbstractAxisProvider_JavaAxisManagerIds()
-	 * @model required="true"
-	 * @generated
-	 */
-	EList<String> getJavaAxisManagerIds();
-
-	/**
-	 * Returns the value of the '<em><b>Axis Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Axis Configuration</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Axis Configuration</em>' containment reference.
-	 * @see #setAxisConfiguration(AbstractAxisConfiguration)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAbstractAxisProvider_AxisConfiguration()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	AbstractAxisConfiguration getAxisConfiguration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxisConfiguration <em>Axis Configuration</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Axis Configuration</em>' containment reference.
-	 * @see #getAxisConfiguration()
-	 * @generated
-	 */
-	void setAxisConfiguration(AbstractAxisConfiguration value);
-
-	/**
-	 * Returns the value of the '<em><b>Pasted Element Type Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pasted Element Type Id</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pasted Element Type Id</em>' attribute.
-	 * @see #setPastedElementTypeId(String)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAbstractAxisProvider_PastedElementTypeId()
-	 * @model
-	 * @generated
-	 */
-	String getPastedElementTypeId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getPastedElementTypeId <em>Pasted Element Type Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pasted Element Type Id</em>' attribute.
-	 * @see #getPastedElementTypeId()
-	 * @generated
-	 */
-	void setPastedElementTypeId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Pasted Element Containment Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pasted Element Containment Feature</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pasted Element Containment Feature</em>' reference.
-	 * @see #setPastedElementContainmentFeature(EStructuralFeature)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAbstractAxisProvider_PastedElementContainmentFeature()
-	 * @model
-	 * @generated
-	 */
-	EStructuralFeature getPastedElementContainmentFeature();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getPastedElementContainmentFeature <em>Pasted Element Containment Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pasted Element Containment Feature</em>' reference.
-	 * @see #getPastedElementContainmentFeature()
-	 * @generated
-	 */
-	void setPastedElementContainmentFeature(EStructuralFeature value);
-
-	/**
-	 * Returns the value of the '<em><b>Alias</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link java.lang.String},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Alias</em>' map isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Alias</em>' map.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAbstractAxisProvider_Alias()
-	 * @model mapType="org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AxisAlias<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
-	 * @generated
-	 */
-	EMap<String, String> getAlias();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	EList<IAxis> getAxis();
-
-} // AbstractAxisProvider
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/DefaultAxisProvider.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/DefaultAxisProvider.java
deleted file mode 100644
index afe892f1a80..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/DefaultAxisProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisprovider;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.IAxis;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Default Axis Provider</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.DefaultAxisProvider#getAxis <em>Axis</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getDefaultAxisProvider()
- * @model
- * @generated
- */
-public interface DefaultAxisProvider extends AbstractAxisProvider {
-	/**
-	 * Returns the value of the '<em><b>Axis</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.IAxis}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Axis</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Axis</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getDefaultAxisProvider_Axis()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<IAxis> getAxis();
-
-} // DefaultAxisProvider
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/EMFFeatureValueAxisProvider.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/EMFFeatureValueAxisProvider.java
deleted file mode 100644
index 9db58c348e6..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/EMFFeatureValueAxisProvider.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisprovider;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>EMF Feature Value Axis Provider</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.EMFFeatureValueAxisProvider#getListenFeature <em>Listen Feature</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getEMFFeatureValueAxisProvider()
- * @model
- * @generated
- */
-public interface EMFFeatureValueAxisProvider extends DefaultAxisProvider {
-	/**
-	 * Returns the value of the '<em><b>Listen Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Listen Feature</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Listen Feature</em>' reference.
-	 * @see #setListenFeature(EStructuralFeature)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getEMFFeatureValueAxisProvider_ListenFeature()
-	 * @model required="true"
-	 * @generated
-	 */
-	EStructuralFeature getListenFeature();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.EMFFeatureValueAxisProvider#getListenFeature <em>Listen Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Listen Feature</em>' reference.
-	 * @see #getListenFeature()
-	 * @generated
-	 */
-	void setListenFeature(EStructuralFeature value);
-
-} // EMFFeatureValueAxisProvider
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java
deleted file mode 100644
index 5094bd0e148..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisprovider;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage
- * @generated
- */
-public interface NattableaxisproviderFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	NattableaxisproviderFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Default Axis Provider</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Default Axis Provider</em>'.
-	 * @generated
-	 */
-	DefaultAxisProvider createDefaultAxisProvider();
-
-	/**
-	 * Returns a new object of class '<em>EMF Feature Value Axis Provider</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>EMF Feature Value Axis Provider</em>'.
-	 * @generated
-	 */
-	EMFFeatureValueAxisProvider createEMFFeatureValueAxisProvider();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	NattableaxisproviderPackage getNattableaxisproviderPackage();
-
-} //NattableaxisproviderFactory
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
deleted file mode 100644
index e1de3859fa8..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
+++ /dev/null
@@ -1,742 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisprovider;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory
- * @model kind="package"
- * @generated
- */
-public interface NattableaxisproviderPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "nattableaxisprovider"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "nattableaxisprovider"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	NattableaxisproviderPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl <em>Abstract Axis Provider</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAbstractAxisProvider()
-	 * @generated
-	 */
-	int ABSTRACT_AXIS_PROVIDER = 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_PROVIDER__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Java Axis Manager Ids</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_PROVIDER__JAVA_AXIS_MANAGER_IDS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Axis Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_PROVIDER__AXIS_CONFIGURATION = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Pasted Element Type Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_TYPE_ID = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Pasted Element Containment Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_CONTAINMENT_FEATURE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Alias</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_PROVIDER__ALIAS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Abstract Axis Provider</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The operation id for the '<em>Get EAnnotation</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_PROVIDER___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;
-
-	/**
-	 * The operation id for the '<em>Get Axis</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_PROVIDER___GET_AXIS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;
-
-	/**
-	 * The number of operations of the '<em>Abstract Axis Provider</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_AXIS_PROVIDER_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.DefaultAxisProviderImpl <em>Default Axis Provider</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.DefaultAxisProviderImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getDefaultAxisProvider()
-	 * @generated
-	 */
-	int DEFAULT_AXIS_PROVIDER = 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_PROVIDER__EANNOTATIONS = ABSTRACT_AXIS_PROVIDER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Java Axis Manager Ids</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_PROVIDER__JAVA_AXIS_MANAGER_IDS = ABSTRACT_AXIS_PROVIDER__JAVA_AXIS_MANAGER_IDS;
-
-	/**
-	 * The feature id for the '<em><b>Axis Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_PROVIDER__AXIS_CONFIGURATION = ABSTRACT_AXIS_PROVIDER__AXIS_CONFIGURATION;
-
-	/**
-	 * The feature id for the '<em><b>Pasted Element Type Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_PROVIDER__PASTED_ELEMENT_TYPE_ID = ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_TYPE_ID;
-
-	/**
-	 * The feature id for the '<em><b>Pasted Element Containment Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_PROVIDER__PASTED_ELEMENT_CONTAINMENT_FEATURE = ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_CONTAINMENT_FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Alias</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_PROVIDER__ALIAS = ABSTRACT_AXIS_PROVIDER__ALIAS;
-
-	/**
-	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_PROVIDER__AXIS = ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Default Axis Provider</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_PROVIDER_FEATURE_COUNT = ABSTRACT_AXIS_PROVIDER_FEATURE_COUNT + 1;
-
-	/**
-	 * The operation id for the '<em>Get EAnnotation</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_PROVIDER___GET_EANNOTATION__STRING = ABSTRACT_AXIS_PROVIDER___GET_EANNOTATION__STRING;
-
-	/**
-	 * The operation id for the '<em>Get Axis</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_PROVIDER___GET_AXIS = ABSTRACT_AXIS_PROVIDER___GET_AXIS;
-
-	/**
-	 * The number of operations of the '<em>Default Axis Provider</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_AXIS_PROVIDER_OPERATION_COUNT = ABSTRACT_AXIS_PROVIDER_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.EMFFeatureValueAxisProviderImpl <em>EMF Feature Value Axis Provider</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.EMFFeatureValueAxisProviderImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getEMFFeatureValueAxisProvider()
-	 * @generated
-	 */
-	int EMF_FEATURE_VALUE_AXIS_PROVIDER = 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_FEATURE_VALUE_AXIS_PROVIDER__EANNOTATIONS = DEFAULT_AXIS_PROVIDER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Java Axis Manager Ids</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_FEATURE_VALUE_AXIS_PROVIDER__JAVA_AXIS_MANAGER_IDS = DEFAULT_AXIS_PROVIDER__JAVA_AXIS_MANAGER_IDS;
-
-	/**
-	 * The feature id for the '<em><b>Axis Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_FEATURE_VALUE_AXIS_PROVIDER__AXIS_CONFIGURATION = DEFAULT_AXIS_PROVIDER__AXIS_CONFIGURATION;
-
-	/**
-	 * The feature id for the '<em><b>Pasted Element Type Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_FEATURE_VALUE_AXIS_PROVIDER__PASTED_ELEMENT_TYPE_ID = DEFAULT_AXIS_PROVIDER__PASTED_ELEMENT_TYPE_ID;
-
-	/**
-	 * The feature id for the '<em><b>Pasted Element Containment Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_FEATURE_VALUE_AXIS_PROVIDER__PASTED_ELEMENT_CONTAINMENT_FEATURE = DEFAULT_AXIS_PROVIDER__PASTED_ELEMENT_CONTAINMENT_FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Alias</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_FEATURE_VALUE_AXIS_PROVIDER__ALIAS = DEFAULT_AXIS_PROVIDER__ALIAS;
-
-	/**
-	 * The feature id for the '<em><b>Axis</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_FEATURE_VALUE_AXIS_PROVIDER__AXIS = DEFAULT_AXIS_PROVIDER__AXIS;
-
-	/**
-	 * The feature id for the '<em><b>Listen Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_FEATURE_VALUE_AXIS_PROVIDER__LISTEN_FEATURE = DEFAULT_AXIS_PROVIDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>EMF Feature Value Axis Provider</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_FEATURE_VALUE_AXIS_PROVIDER_FEATURE_COUNT = DEFAULT_AXIS_PROVIDER_FEATURE_COUNT + 1;
-
-	/**
-	 * The operation id for the '<em>Get EAnnotation</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_FEATURE_VALUE_AXIS_PROVIDER___GET_EANNOTATION__STRING = DEFAULT_AXIS_PROVIDER___GET_EANNOTATION__STRING;
-
-	/**
-	 * The operation id for the '<em>Get Axis</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_FEATURE_VALUE_AXIS_PROVIDER___GET_AXIS = DEFAULT_AXIS_PROVIDER___GET_AXIS;
-
-	/**
-	 * The number of operations of the '<em>EMF Feature Value Axis Provider</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EMF_FEATURE_VALUE_AXIS_PROVIDER_OPERATION_COUNT = DEFAULT_AXIS_PROVIDER_OPERATION_COUNT + 0;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisAliasImpl <em>Axis Alias</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisAliasImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAxisAlias()
-	 * @generated
-	 */
-	int AXIS_ALIAS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AXIS_ALIAS__KEY = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AXIS_ALIAS__VALUE = 1;
-
-	/**
-	 * The number of structural features of the '<em>Axis Alias</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AXIS_ALIAS_FEATURE_COUNT = 2;
-
-	/**
-	 * The number of operations of the '<em>Axis Alias</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AXIS_ALIAS_OPERATION_COUNT = 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider <em>Abstract Axis Provider</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract Axis Provider</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider
-	 * @generated
-	 */
-	EClass getAbstractAxisProvider();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getJavaAxisManagerIds <em>Java Axis Manager Ids</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Java Axis Manager Ids</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getJavaAxisManagerIds()
-	 * @see #getAbstractAxisProvider()
-	 * @generated
-	 */
-	EAttribute getAbstractAxisProvider_JavaAxisManagerIds();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxisConfiguration <em>Axis Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Axis Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxisConfiguration()
-	 * @see #getAbstractAxisProvider()
-	 * @generated
-	 */
-	EReference getAbstractAxisProvider_AxisConfiguration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getPastedElementTypeId <em>Pasted Element Type Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Pasted Element Type Id</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getPastedElementTypeId()
-	 * @see #getAbstractAxisProvider()
-	 * @generated
-	 */
-	EAttribute getAbstractAxisProvider_PastedElementTypeId();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getPastedElementContainmentFeature <em>Pasted Element Containment Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Pasted Element Containment Feature</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getPastedElementContainmentFeature()
-	 * @see #getAbstractAxisProvider()
-	 * @generated
-	 */
-	EReference getAbstractAxisProvider_PastedElementContainmentFeature();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAlias <em>Alias</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>Alias</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAlias()
-	 * @see #getAbstractAxisProvider()
-	 * @generated
-	 */
-	EReference getAbstractAxisProvider_Alias();
-
-	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis() <em>Get Axis</em>}' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the '<em>Get Axis</em>' operation.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider#getAxis()
-	 * @generated
-	 */
-	EOperation getAbstractAxisProvider__GetAxis();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.DefaultAxisProvider <em>Default Axis Provider</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Default Axis Provider</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.DefaultAxisProvider
-	 * @generated
-	 */
-	EClass getDefaultAxisProvider();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.DefaultAxisProvider#getAxis <em>Axis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Axis</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.DefaultAxisProvider#getAxis()
-	 * @see #getDefaultAxisProvider()
-	 * @generated
-	 */
-	EReference getDefaultAxisProvider_Axis();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.EMFFeatureValueAxisProvider <em>EMF Feature Value Axis Provider</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>EMF Feature Value Axis Provider</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.EMFFeatureValueAxisProvider
-	 * @generated
-	 */
-	EClass getEMFFeatureValueAxisProvider();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.EMFFeatureValueAxisProvider#getListenFeature <em>Listen Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Listen Feature</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.EMFFeatureValueAxisProvider#getListenFeature()
-	 * @see #getEMFFeatureValueAxisProvider()
-	 * @generated
-	 */
-	EReference getEMFFeatureValueAxisProvider_ListenFeature();
-
-	/**
-	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Axis Alias</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Axis Alias</em>'.
-	 * @see java.util.Map.Entry
-	 * @model keyDataType="org.eclipse.emf.ecore.EString"
-	 *        valueDataType="org.eclipse.emf.ecore.EString"
-	 * @generated
-	 */
-	EClass getAxisAlias();
-
-	/**
-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Key</em>'.
-	 * @see java.util.Map.Entry
-	 * @see #getAxisAlias()
-	 * @generated
-	 */
-	EAttribute getAxisAlias_Key();
-
-	/**
-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see java.util.Map.Entry
-	 * @see #getAxisAlias()
-	 * @generated
-	 */
-	EAttribute getAxisAlias_Value();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	NattableaxisproviderFactory getNattableaxisproviderFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl <em>Abstract Axis Provider</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAbstractAxisProvider()
-		 * @generated
-		 */
-		EClass ABSTRACT_AXIS_PROVIDER = eINSTANCE.getAbstractAxisProvider();
-
-		/**
-		 * The meta object literal for the '<em><b>Java Axis Manager Ids</b></em>' attribute list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ABSTRACT_AXIS_PROVIDER__JAVA_AXIS_MANAGER_IDS = eINSTANCE.getAbstractAxisProvider_JavaAxisManagerIds();
-
-		/**
-		 * The meta object literal for the '<em><b>Axis Configuration</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ABSTRACT_AXIS_PROVIDER__AXIS_CONFIGURATION = eINSTANCE.getAbstractAxisProvider_AxisConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Pasted Element Type Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_TYPE_ID = eINSTANCE.getAbstractAxisProvider_PastedElementTypeId();
-
-		/**
-		 * The meta object literal for the '<em><b>Pasted Element Containment Feature</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_CONTAINMENT_FEATURE = eINSTANCE.getAbstractAxisProvider_PastedElementContainmentFeature();
-
-		/**
-		 * The meta object literal for the '<em><b>Alias</b></em>' map feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ABSTRACT_AXIS_PROVIDER__ALIAS = eINSTANCE.getAbstractAxisProvider_Alias();
-
-		/**
-		 * The meta object literal for the '<em><b>Get Axis</b></em>' operation.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EOperation ABSTRACT_AXIS_PROVIDER___GET_AXIS = eINSTANCE.getAbstractAxisProvider__GetAxis();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.DefaultAxisProviderImpl <em>Default Axis Provider</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.DefaultAxisProviderImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getDefaultAxisProvider()
-		 * @generated
-		 */
-		EClass DEFAULT_AXIS_PROVIDER = eINSTANCE.getDefaultAxisProvider();
-
-		/**
-		 * The meta object literal for the '<em><b>Axis</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DEFAULT_AXIS_PROVIDER__AXIS = eINSTANCE.getDefaultAxisProvider_Axis();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.EMFFeatureValueAxisProviderImpl <em>EMF Feature Value Axis Provider</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.EMFFeatureValueAxisProviderImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getEMFFeatureValueAxisProvider()
-		 * @generated
-		 */
-		EClass EMF_FEATURE_VALUE_AXIS_PROVIDER = eINSTANCE.getEMFFeatureValueAxisProvider();
-
-		/**
-		 * The meta object literal for the '<em><b>Listen Feature</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EMF_FEATURE_VALUE_AXIS_PROVIDER__LISTEN_FEATURE = eINSTANCE.getEMFFeatureValueAxisProvider_ListenFeature();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisAliasImpl <em>Axis Alias</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisAliasImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl#getAxisAlias()
-		 * @generated
-		 */
-		EClass AXIS_ALIAS = eINSTANCE.getAxisAlias();
-
-		/**
-		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute AXIS_ALIAS__KEY = eINSTANCE.getAxisAlias_Key();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute AXIS_ALIAS__VALUE = eINSTANCE.getAxisAlias_Value();
-
-	}
-
-} //NattableaxisproviderPackage
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
deleted file mode 100644
index e9c218d4f35..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisprovider.impl;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.EcoreEMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.infra.nattable.model.nattable.IAxis;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractAxisConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Axis Provider</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl#getJavaAxisManagerIds <em>Java Axis Manager Ids</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl#getAxisConfiguration <em>Axis Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl#getPastedElementTypeId <em>Pasted Element Type Id</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl#getPastedElementContainmentFeature <em>Pasted Element Containment Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AbstractAxisProviderImpl#getAlias <em>Alias</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class AbstractAxisProviderImpl extends EModelElementImpl implements AbstractAxisProvider {
-	/**
-	 * The cached value of the '{@link #getJavaAxisManagerIds() <em>Java Axis Manager Ids</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJavaAxisManagerIds()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<String> javaAxisManagerIds;
-
-	/**
-	 * The cached value of the '{@link #getAxisConfiguration() <em>Axis Configuration</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAxisConfiguration()
-	 * @generated
-	 * @ordered
-	 */
-	protected AbstractAxisConfiguration axisConfiguration;
-
-	/**
-	 * The default value of the '{@link #getPastedElementTypeId() <em>Pasted Element Type Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPastedElementTypeId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PASTED_ELEMENT_TYPE_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPastedElementTypeId() <em>Pasted Element Type Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPastedElementTypeId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String pastedElementTypeId = PASTED_ELEMENT_TYPE_ID_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPastedElementContainmentFeature() <em>Pasted Element Containment Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPastedElementContainmentFeature()
-	 * @generated
-	 * @ordered
-	 */
-	protected EStructuralFeature pastedElementContainmentFeature;
-
-	/**
-	 * The cached value of the '{@link #getAlias() <em>Alias</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlias()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap<String, String> alias;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractAxisProviderImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattableaxisproviderPackage.Literals.ABSTRACT_AXIS_PROVIDER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<String> getJavaAxisManagerIds() {
-		if (javaAxisManagerIds == null) {
-			javaAxisManagerIds = new EDataTypeUniqueEList<String>(String.class, this, NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__JAVA_AXIS_MANAGER_IDS);
-		}
-		return javaAxisManagerIds;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractAxisConfiguration getAxisConfiguration() {
-		return axisConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAxisConfiguration(AbstractAxisConfiguration newAxisConfiguration, NotificationChain msgs) {
-		AbstractAxisConfiguration oldAxisConfiguration = axisConfiguration;
-		axisConfiguration = newAxisConfiguration;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__AXIS_CONFIGURATION, oldAxisConfiguration, newAxisConfiguration);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAxisConfiguration(AbstractAxisConfiguration newAxisConfiguration) {
-		if (newAxisConfiguration != axisConfiguration) {
-			NotificationChain msgs = null;
-			if (axisConfiguration != null)
-				msgs = ((InternalEObject)axisConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__AXIS_CONFIGURATION, null, msgs);
-			if (newAxisConfiguration != null)
-				msgs = ((InternalEObject)newAxisConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__AXIS_CONFIGURATION, null, msgs);
-			msgs = basicSetAxisConfiguration(newAxisConfiguration, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__AXIS_CONFIGURATION, newAxisConfiguration, newAxisConfiguration));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPastedElementTypeId() {
-		return pastedElementTypeId;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPastedElementTypeId(String newPastedElementTypeId) {
-		String oldPastedElementTypeId = pastedElementTypeId;
-		pastedElementTypeId = newPastedElementTypeId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_TYPE_ID, oldPastedElementTypeId, pastedElementTypeId));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature getPastedElementContainmentFeature() {
-		if (pastedElementContainmentFeature != null && pastedElementContainmentFeature.eIsProxy()) {
-			InternalEObject oldPastedElementContainmentFeature = (InternalEObject)pastedElementContainmentFeature;
-			pastedElementContainmentFeature = (EStructuralFeature)eResolveProxy(oldPastedElementContainmentFeature);
-			if (pastedElementContainmentFeature != oldPastedElementContainmentFeature) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_CONTAINMENT_FEATURE, oldPastedElementContainmentFeature, pastedElementContainmentFeature));
-			}
-		}
-		return pastedElementContainmentFeature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature basicGetPastedElementContainmentFeature() {
-		return pastedElementContainmentFeature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPastedElementContainmentFeature(EStructuralFeature newPastedElementContainmentFeature) {
-		EStructuralFeature oldPastedElementContainmentFeature = pastedElementContainmentFeature;
-		pastedElementContainmentFeature = newPastedElementContainmentFeature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_CONTAINMENT_FEATURE, oldPastedElementContainmentFeature, pastedElementContainmentFeature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap<String, String> getAlias() {
-		if (alias == null) {
-			alias = new EcoreEMap<String,String>(NattableaxisproviderPackage.Literals.AXIS_ALIAS, AxisAliasImpl.class, this, NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__ALIAS);
-		}
-		return alias;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<IAxis> getAxis() {
-		// TODO: implement this method
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__AXIS_CONFIGURATION:
-				return basicSetAxisConfiguration(null, msgs);
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__ALIAS:
-				return ((InternalEList<?>)getAlias()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__JAVA_AXIS_MANAGER_IDS:
-				return getJavaAxisManagerIds();
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__AXIS_CONFIGURATION:
-				return getAxisConfiguration();
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_TYPE_ID:
-				return getPastedElementTypeId();
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_CONTAINMENT_FEATURE:
-				if (resolve) return getPastedElementContainmentFeature();
-				return basicGetPastedElementContainmentFeature();
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__ALIAS:
-				if (coreType) return getAlias();
-				else return getAlias().map();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__JAVA_AXIS_MANAGER_IDS:
-				getJavaAxisManagerIds().clear();
-				getJavaAxisManagerIds().addAll((Collection<? extends String>)newValue);
-				return;
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__AXIS_CONFIGURATION:
-				setAxisConfiguration((AbstractAxisConfiguration)newValue);
-				return;
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_TYPE_ID:
-				setPastedElementTypeId((String)newValue);
-				return;
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_CONTAINMENT_FEATURE:
-				setPastedElementContainmentFeature((EStructuralFeature)newValue);
-				return;
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__ALIAS:
-				((EStructuralFeature.Setting)getAlias()).set(newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__JAVA_AXIS_MANAGER_IDS:
-				getJavaAxisManagerIds().clear();
-				return;
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__AXIS_CONFIGURATION:
-				setAxisConfiguration((AbstractAxisConfiguration)null);
-				return;
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_TYPE_ID:
-				setPastedElementTypeId(PASTED_ELEMENT_TYPE_ID_EDEFAULT);
-				return;
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_CONTAINMENT_FEATURE:
-				setPastedElementContainmentFeature((EStructuralFeature)null);
-				return;
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__ALIAS:
-				getAlias().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__JAVA_AXIS_MANAGER_IDS:
-				return javaAxisManagerIds != null && !javaAxisManagerIds.isEmpty();
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__AXIS_CONFIGURATION:
-				return axisConfiguration != null;
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_TYPE_ID:
-				return PASTED_ELEMENT_TYPE_ID_EDEFAULT == null ? pastedElementTypeId != null : !PASTED_ELEMENT_TYPE_ID_EDEFAULT.equals(pastedElementTypeId);
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_CONTAINMENT_FEATURE:
-				return pastedElementContainmentFeature != null;
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__ALIAS:
-				return alias != null && !alias.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER___GET_AXIS:
-				return getAxis();
-		}
-		return super.eInvoke(operationID, arguments);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (javaAxisManagerIds: "); //$NON-NLS-1$
-		result.append(javaAxisManagerIds);
-		result.append(", pastedElementTypeId: "); //$NON-NLS-1$
-		result.append(pastedElementTypeId);
-		result.append(')');
-		return result.toString();
-	}
-
-} //AbstractAxisProviderImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisAliasImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisAliasImpl.java
deleted file mode 100644
index 4259b6bb20e..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisAliasImpl.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisprovider.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.BasicEMap;
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Axis Alias</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisAliasImpl#getTypedKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.AxisAliasImpl#getTypedValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AxisAliasImpl extends MinimalEObjectImpl.Container implements BasicEMap.Entry<String,String> {
-	/**
-	 * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String KEY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected String key = KEY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AxisAliasImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattableaxisproviderPackage.Literals.AXIS_ALIAS;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTypedKey() {
-		return key;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypedKey(String newKey) {
-		String oldKey = key;
-		key = newKey;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.AXIS_ALIAS__KEY, oldKey, key));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTypedValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypedValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.AXIS_ALIAS__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.AXIS_ALIAS__KEY:
-				return getTypedKey();
-			case NattableaxisproviderPackage.AXIS_ALIAS__VALUE:
-				return getTypedValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.AXIS_ALIAS__KEY:
-				setTypedKey((String)newValue);
-				return;
-			case NattableaxisproviderPackage.AXIS_ALIAS__VALUE:
-				setTypedValue((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.AXIS_ALIAS__KEY:
-				setTypedKey(KEY_EDEFAULT);
-				return;
-			case NattableaxisproviderPackage.AXIS_ALIAS__VALUE:
-				setTypedValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.AXIS_ALIAS__KEY:
-				return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
-			case NattableaxisproviderPackage.AXIS_ALIAS__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (key: "); //$NON-NLS-1$
-		result.append(key);
-		result.append(", value: "); //$NON-NLS-1$
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected int hash = -1;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getHash() {
-		if (hash == -1) {
-			Object theKey = getKey();
-			hash = (theKey == null ? 0 : theKey.hashCode());
-		}
-		return hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHash(int hash) {
-		this.hash = hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getKey() {
-		return getTypedKey();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKey(String key) {
-		setTypedKey(key);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return getTypedValue();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String setValue(String value) {
-		String oldValue = getValue();
-		setTypedValue(value);
-		return oldValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public EMap<String, String> getEMap() {
-		EObject container = eContainer();
-		return container == null ? null : (EMap<String, String>)container.eGet(eContainmentFeature());
-	}
-
-} //AxisAliasImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/DefaultAxisProviderImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/DefaultAxisProviderImpl.java
deleted file mode 100644
index 785a151c731..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/DefaultAxisProviderImpl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisprovider.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.IAxis;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.DefaultAxisProvider;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Default Axis Provider</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.DefaultAxisProviderImpl#getAxis <em>Axis</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DefaultAxisProviderImpl extends AbstractAxisProviderImpl implements DefaultAxisProvider {
-	/**
-	 * The cached value of the '{@link #getAxis() <em>Axis</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAxis()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<IAxis> axis;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DefaultAxisProviderImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattableaxisproviderPackage.Literals.DEFAULT_AXIS_PROVIDER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<IAxis> getAxis() {
-		if (axis == null) {
-			axis = new EObjectContainmentEList<IAxis>(IAxis.class, this, NattableaxisproviderPackage.DEFAULT_AXIS_PROVIDER__AXIS);
-		}
-		return axis;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.DEFAULT_AXIS_PROVIDER__AXIS:
-				return ((InternalEList<?>)getAxis()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.DEFAULT_AXIS_PROVIDER__AXIS:
-				return getAxis();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.DEFAULT_AXIS_PROVIDER__AXIS:
-				getAxis().clear();
-				getAxis().addAll((Collection<? extends IAxis>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.DEFAULT_AXIS_PROVIDER__AXIS:
-				getAxis().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.DEFAULT_AXIS_PROVIDER__AXIS:
-				return axis != null && !axis.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //DefaultAxisProviderImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/EMFFeatureValueAxisProviderImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/EMFFeatureValueAxisProviderImpl.java
deleted file mode 100644
index 5a93474f503..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/EMFFeatureValueAxisProviderImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisprovider.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.EMFFeatureValueAxisProvider;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EMF Feature Value Axis Provider</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.EMFFeatureValueAxisProviderImpl#getListenFeature <em>Listen Feature</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EMFFeatureValueAxisProviderImpl extends DefaultAxisProviderImpl implements EMFFeatureValueAxisProvider {
-	/**
-	 * The cached value of the '{@link #getListenFeature() <em>Listen Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getListenFeature()
-	 * @generated
-	 * @ordered
-	 */
-	protected EStructuralFeature listenFeature;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EMFFeatureValueAxisProviderImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattableaxisproviderPackage.Literals.EMF_FEATURE_VALUE_AXIS_PROVIDER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature getListenFeature() {
-		if (listenFeature != null && listenFeature.eIsProxy()) {
-			InternalEObject oldListenFeature = (InternalEObject)listenFeature;
-			listenFeature = (EStructuralFeature)eResolveProxy(oldListenFeature);
-			if (listenFeature != oldListenFeature) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattableaxisproviderPackage.EMF_FEATURE_VALUE_AXIS_PROVIDER__LISTEN_FEATURE, oldListenFeature, listenFeature));
-			}
-		}
-		return listenFeature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature basicGetListenFeature() {
-		return listenFeature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setListenFeature(EStructuralFeature newListenFeature) {
-		EStructuralFeature oldListenFeature = listenFeature;
-		listenFeature = newListenFeature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisproviderPackage.EMF_FEATURE_VALUE_AXIS_PROVIDER__LISTEN_FEATURE, oldListenFeature, listenFeature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.EMF_FEATURE_VALUE_AXIS_PROVIDER__LISTEN_FEATURE:
-				if (resolve) return getListenFeature();
-				return basicGetListenFeature();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.EMF_FEATURE_VALUE_AXIS_PROVIDER__LISTEN_FEATURE:
-				setListenFeature((EStructuralFeature)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.EMF_FEATURE_VALUE_AXIS_PROVIDER__LISTEN_FEATURE:
-				setListenFeature((EStructuralFeature)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NattableaxisproviderPackage.EMF_FEATURE_VALUE_AXIS_PROVIDER__LISTEN_FEATURE:
-				return listenFeature != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //EMFFeatureValueAxisProviderImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java
deleted file mode 100644
index f3514ef8bc7..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisprovider.impl;
-
-import java.util.Map;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class NattableaxisproviderFactoryImpl extends EFactoryImpl implements NattableaxisproviderFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static NattableaxisproviderFactory init() {
-		try {
-			NattableaxisproviderFactory theNattableaxisproviderFactory = (NattableaxisproviderFactory)EPackage.Registry.INSTANCE.getEFactory(NattableaxisproviderPackage.eNS_URI);
-			if (theNattableaxisproviderFactory != null) {
-				return theNattableaxisproviderFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new NattableaxisproviderFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableaxisproviderFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case NattableaxisproviderPackage.DEFAULT_AXIS_PROVIDER: return createDefaultAxisProvider();
-			case NattableaxisproviderPackage.EMF_FEATURE_VALUE_AXIS_PROVIDER: return createEMFFeatureValueAxisProvider();
-			case NattableaxisproviderPackage.AXIS_ALIAS: return (EObject)createAxisAlias();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DefaultAxisProvider createDefaultAxisProvider() {
-		DefaultAxisProviderImpl defaultAxisProvider = new DefaultAxisProviderImpl();
-		return defaultAxisProvider;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMFFeatureValueAxisProvider createEMFFeatureValueAxisProvider() {
-		EMFFeatureValueAxisProviderImpl emfFeatureValueAxisProvider = new EMFFeatureValueAxisProviderImpl();
-		return emfFeatureValueAxisProvider;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Map.Entry<String, String> createAxisAlias() {
-		AxisAliasImpl axisAlias = new AxisAliasImpl();
-		return axisAlias;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableaxisproviderPackage getNattableaxisproviderPackage() {
-		return (NattableaxisproviderPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static NattableaxisproviderPackage getPackage() {
-		return NattableaxisproviderPackage.eINSTANCE;
-	}
-
-} //NattableaxisproviderFactoryImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
deleted file mode 100644
index 999771b486d..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisprovider.impl;
-
-import java.util.Map;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.DefaultAxisProvider;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.EMFFeatureValueAxisProvider;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class NattableaxisproviderPackageImpl extends EPackageImpl implements NattableaxisproviderPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass abstractAxisProviderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass defaultAxisProviderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass emfFeatureValueAxisProviderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass axisAliasEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private NattableaxisproviderPackageImpl() {
-		super(eNS_URI, NattableaxisproviderFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link NattableaxisproviderPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static NattableaxisproviderPackage init() {
-		if (isInited) return (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);
-
-		// Obtain or create and register package
-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableaxisproviderPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theNattableaxisproviderPackage.createPackageContents();
-		theNattablePackage.createPackageContents();
-		theNattableconfigurationPackage.createPackageContents();
-		theNattablelabelproviderPackage.createPackageContents();
-		theNattableaxisconfigurationPackage.createPackageContents();
-		theNattabletesterPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theNattableaxisproviderPackage.initializePackageContents();
-		theNattablePackage.initializePackageContents();
-		theNattableconfigurationPackage.initializePackageContents();
-		theNattablelabelproviderPackage.initializePackageContents();
-		theNattableaxisconfigurationPackage.initializePackageContents();
-		theNattabletesterPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theNattableaxisproviderPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(NattableaxisproviderPackage.eNS_URI, theNattableaxisproviderPackage);
-		return theNattableaxisproviderPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAbstractAxisProvider() {
-		return abstractAxisProviderEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAbstractAxisProvider_JavaAxisManagerIds() {
-		return (EAttribute)abstractAxisProviderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAbstractAxisProvider_AxisConfiguration() {
-		return (EReference)abstractAxisProviderEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAbstractAxisProvider_PastedElementTypeId() {
-		return (EAttribute)abstractAxisProviderEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAbstractAxisProvider_PastedElementContainmentFeature() {
-		return (EReference)abstractAxisProviderEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAbstractAxisProvider_Alias() {
-		return (EReference)abstractAxisProviderEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EOperation getAbstractAxisProvider__GetAxis() {
-		return abstractAxisProviderEClass.getEOperations().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDefaultAxisProvider() {
-		return defaultAxisProviderEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDefaultAxisProvider_Axis() {
-		return (EReference)defaultAxisProviderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEMFFeatureValueAxisProvider() {
-		return emfFeatureValueAxisProviderEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEMFFeatureValueAxisProvider_ListenFeature() {
-		return (EReference)emfFeatureValueAxisProviderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAxisAlias() {
-		return axisAliasEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAxisAlias_Key() {
-		return (EAttribute)axisAliasEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAxisAlias_Value() {
-		return (EAttribute)axisAliasEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableaxisproviderFactory getNattableaxisproviderFactory() {
-		return (NattableaxisproviderFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		abstractAxisProviderEClass = createEClass(ABSTRACT_AXIS_PROVIDER);
-		createEAttribute(abstractAxisProviderEClass, ABSTRACT_AXIS_PROVIDER__JAVA_AXIS_MANAGER_IDS);
-		createEReference(abstractAxisProviderEClass, ABSTRACT_AXIS_PROVIDER__AXIS_CONFIGURATION);
-		createEAttribute(abstractAxisProviderEClass, ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_TYPE_ID);
-		createEReference(abstractAxisProviderEClass, ABSTRACT_AXIS_PROVIDER__PASTED_ELEMENT_CONTAINMENT_FEATURE);
-		createEReference(abstractAxisProviderEClass, ABSTRACT_AXIS_PROVIDER__ALIAS);
-		createEOperation(abstractAxisProviderEClass, ABSTRACT_AXIS_PROVIDER___GET_AXIS);
-
-		defaultAxisProviderEClass = createEClass(DEFAULT_AXIS_PROVIDER);
-		createEReference(defaultAxisProviderEClass, DEFAULT_AXIS_PROVIDER__AXIS);
-
-		emfFeatureValueAxisProviderEClass = createEClass(EMF_FEATURE_VALUE_AXIS_PROVIDER);
-		createEReference(emfFeatureValueAxisProviderEClass, EMF_FEATURE_VALUE_AXIS_PROVIDER__LISTEN_FEATURE);
-
-		axisAliasEClass = createEClass(AXIS_ALIAS);
-		createEAttribute(axisAliasEClass, AXIS_ALIAS__KEY);
-		createEAttribute(axisAliasEClass, AXIS_ALIAS__VALUE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-		NattableaxisconfigurationPackage theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI);
-		NattablePackage theNattablePackage = (NattablePackage)EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		abstractAxisProviderEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
-		defaultAxisProviderEClass.getESuperTypes().add(this.getAbstractAxisProvider());
-		emfFeatureValueAxisProviderEClass.getESuperTypes().add(this.getDefaultAxisProvider());
-
-		// Initialize classes, features, and operations; add parameters
-		initEClass(abstractAxisProviderEClass, AbstractAxisProvider.class, "AbstractAxisProvider", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getAbstractAxisProvider_JavaAxisManagerIds(), ecorePackage.getEString(), "javaAxisManagerIds", null, 1, -1, AbstractAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getAbstractAxisProvider_AxisConfiguration(), theNattableaxisconfigurationPackage.getAbstractAxisConfiguration(), null, "axisConfiguration", null, 1, 1, AbstractAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getAbstractAxisProvider_PastedElementTypeId(), theEcorePackage.getEString(), "pastedElementTypeId", null, 0, 1, AbstractAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getAbstractAxisProvider_PastedElementContainmentFeature(), theEcorePackage.getEStructuralFeature(), null, "pastedElementContainmentFeature", null, 0, 1, AbstractAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getAbstractAxisProvider_Alias(), this.getAxisAlias(), null, "alias", null, 0, -1, AbstractAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEOperation(getAbstractAxisProvider__GetAxis(), theNattablePackage.getIAxis(), "getAxis", 0, -1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(defaultAxisProviderEClass, DefaultAxisProvider.class, "DefaultAxisProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getDefaultAxisProvider_Axis(), theNattablePackage.getIAxis(), null, "axis", null, 0, -1, DefaultAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(emfFeatureValueAxisProviderEClass, EMFFeatureValueAxisProvider.class, "EMFFeatureValueAxisProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getEMFFeatureValueAxisProvider_ListenFeature(), theEcorePackage.getEStructuralFeature(), null, "listenFeature", null, 1, 1, EMFFeatureValueAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(axisAliasEClass, Map.Entry.class, "AxisAlias", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getAxisAlias_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getAxisAlias_Value(), ecorePackage.getEString(), "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-	}
-
-} //NattableaxisproviderPackageImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java
deleted file mode 100644
index 9cd09c0709a..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisprovider.util;
-
-import java.util.Map;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage
- * @generated
- */
-public class NattableaxisproviderAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static NattableaxisproviderPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableaxisproviderAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = NattableaxisproviderPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NattableaxisproviderSwitch<Adapter> modelSwitch =
-		new NattableaxisproviderSwitch<Adapter>() {
-			@Override
-			public Adapter caseAbstractAxisProvider(AbstractAxisProvider object) {
-				return createAbstractAxisProviderAdapter();
-			}
-			@Override
-			public Adapter caseDefaultAxisProvider(DefaultAxisProvider object) {
-				return createDefaultAxisProviderAdapter();
-			}
-			@Override
-			public Adapter caseEMFFeatureValueAxisProvider(EMFFeatureValueAxisProvider object) {
-				return createEMFFeatureValueAxisProviderAdapter();
-			}
-			@Override
-			public Adapter caseAxisAlias(Map.Entry<String, String> object) {
-				return createAxisAliasAdapter();
-			}
-			@Override
-			public Adapter caseEModelElement(EModelElement object) {
-				return createEModelElementAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider <em>Abstract Axis Provider</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider
-	 * @generated
-	 */
-	public Adapter createAbstractAxisProviderAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.DefaultAxisProvider <em>Default Axis Provider</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.DefaultAxisProvider
-	 * @generated
-	 */
-	public Adapter createDefaultAxisProviderAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.EMFFeatureValueAxisProvider <em>EMF Feature Value Axis Provider</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.EMFFeatureValueAxisProvider
-	 * @generated
-	 */
-	public Adapter createEMFFeatureValueAxisProviderAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>Axis Alias</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see java.util.Map.Entry
-	 * @generated
-	 */
-	public Adapter createAxisAliasAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EModelElement
-	 * @generated
-	 */
-	public Adapter createEModelElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //NattableaxisproviderAdapterFactory
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java
deleted file mode 100644
index a247c7b63fa..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * 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.model.nattable.nattableaxisprovider.util;
-
-import java.util.Map;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage
- * @generated
- */
-public class NattableaxisproviderSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static NattableaxisproviderPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableaxisproviderSwitch() {
-		if (modelPackage == null) {
-			modelPackage = NattableaxisproviderPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER: {
-				AbstractAxisProvider abstractAxisProvider = (AbstractAxisProvider)theEObject;
-				T result = caseAbstractAxisProvider(abstractAxisProvider);
-				if (result == null) result = caseEModelElement(abstractAxisProvider);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NattableaxisproviderPackage.DEFAULT_AXIS_PROVIDER: {
-				DefaultAxisProvider defaultAxisProvider = (DefaultAxisProvider)theEObject;
-				T result = caseDefaultAxisProvider(defaultAxisProvider);
-				if (result == null) result = caseAbstractAxisProvider(defaultAxisProvider);
-				if (result == null) result = caseEModelElement(defaultAxisProvider);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NattableaxisproviderPackage.EMF_FEATURE_VALUE_AXIS_PROVIDER: {
-				EMFFeatureValueAxisProvider emfFeatureValueAxisProvider = (EMFFeatureValueAxisProvider)theEObject;
-				T result = caseEMFFeatureValueAxisProvider(emfFeatureValueAxisProvider);
-				if (result == null) result = caseDefaultAxisProvider(emfFeatureValueAxisProvider);
-				if (result == null) result = caseAbstractAxisProvider(emfFeatureValueAxisProvider);
-				if (result == null) result = caseEModelElement(emfFeatureValueAxisProvider);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NattableaxisproviderPackage.AXIS_ALIAS: {
-				@SuppressWarnings("unchecked") Map.Entry<String, String> axisAlias = (Map.Entry<String, String>)theEObject;
-				T result = caseAxisAlias(axisAlias);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Axis Provider</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Abstract Axis Provider</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAbstractAxisProvider(AbstractAxisProvider object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Default Axis Provider</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Default Axis Provider</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDefaultAxisProvider(DefaultAxisProvider object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EMF Feature Value Axis Provider</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EMF Feature Value Axis Provider</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEMFFeatureValueAxisProvider(EMFFeatureValueAxisProvider object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Axis Alias</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Axis Alias</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAxisAlias(Map.Entry<String, String> object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEModelElement(EModelElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //NattableaxisproviderSwitch
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/AbstractTableConfiguration.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/AbstractTableConfiguration.java
deleted file mode 100644
index 30c6be16911..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/AbstractTableConfiguration.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * 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.model.nattable.nattableconfiguration;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Table Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getRowAxisProvider <em>Row Axis Provider</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getColumnAxisProvider <em>Column Axis Provider</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getEditorDeclaration <em>Editor Declaration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getAbstractTableConfiguration()
- * @model abstract="true"
- * @generated
- */
-public interface AbstractTableConfiguration extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Row Axis Provider</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Row Axis Provider</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Row Axis Provider</em>' containment reference.
-	 * @see #setRowAxisProvider(AbstractAxisProvider)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getAbstractTableConfiguration_RowAxisProvider()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	AbstractAxisProvider getRowAxisProvider();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getRowAxisProvider <em>Row Axis Provider</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Row Axis Provider</em>' containment reference.
-	 * @see #getRowAxisProvider()
-	 * @generated
-	 */
-	void setRowAxisProvider(AbstractAxisProvider value);
-
-	/**
-	 * Returns the value of the '<em><b>Column Axis Provider</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column Axis Provider</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Column Axis Provider</em>' containment reference.
-	 * @see #setColumnAxisProvider(AbstractAxisProvider)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getAbstractTableConfiguration_ColumnAxisProvider()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	AbstractAxisProvider getColumnAxisProvider();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getColumnAxisProvider <em>Column Axis Provider</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Column Axis Provider</em>' containment reference.
-	 * @see #getColumnAxisProvider()
-	 * @generated
-	 */
-	void setColumnAxisProvider(AbstractAxisProvider value);
-
-	/**
-	 * Returns the value of the '<em><b>Editor Declaration</b></em>' attribute.
-	 * The default value is <code>"COLUMN"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Editor Declaration</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Editor Declaration</em>' attribute.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
-	 * @see #setEditorDeclaration(CellEditorDeclaration)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getAbstractTableConfiguration_EditorDeclaration()
-	 * @model default="COLUMN" required="true"
-	 * @generated
-	 */
-	CellEditorDeclaration getEditorDeclaration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getEditorDeclaration <em>Editor Declaration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Editor Declaration</em>' attribute.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
-	 * @see #getEditorDeclaration()
-	 * @generated
-	 */
-	void setEditorDeclaration(CellEditorDeclaration value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getAbstractTableConfiguration_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getAbstractTableConfiguration_Description()
-	 * @model
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-} // AbstractTableConfiguration
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
deleted file mode 100644
index 62a31c7313e..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/**
- * 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.model.nattable.nattableconfiguration;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Cell Editor Declaration</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getCellEditorDeclaration()
- * @model
- * @generated
- */
-public enum CellEditorDeclaration implements Enumerator {
-	/**
-	 * The '<em><b>COLUMN</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #COLUMN_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	COLUMN(0, "COLUMN", "COLUMN"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>ROW</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ROW_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ROW(1, "ROW", "ROW"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>CELL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CELL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	CELL(2, "CELL", "CELL"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>COLUMN</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>COLUMN</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #COLUMN
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int COLUMN_VALUE = 0;
-
-	/**
-	 * The '<em><b>ROW</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ROW</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ROW
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ROW_VALUE = 1;
-
-	/**
-	 * The '<em><b>CELL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CELL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CELL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CELL_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final CellEditorDeclaration[] VALUES_ARRAY =
-		new CellEditorDeclaration[] {
-			COLUMN,
-			ROW,
-			CELL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<CellEditorDeclaration> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CellEditorDeclaration get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			CellEditorDeclaration result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CellEditorDeclaration getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			CellEditorDeclaration result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static CellEditorDeclaration get(int value) {
-		switch (value) {
-			case COLUMN_VALUE: return COLUMN;
-			case ROW_VALUE: return ROW;
-			case CELL_VALUE: return CELL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private CellEditorDeclaration(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //CellEditorDeclaration
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
deleted file mode 100644
index a2d313d5772..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * 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.model.nattable.nattableconfiguration;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage
- * @generated
- */
-public interface NattableconfigurationFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	NattableconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Table Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Table Configuration</em>'.
-	 * @generated
-	 */
-	TableConfiguration createTableConfiguration();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	NattableconfigurationPackage getNattableconfigurationPackage();
-
-} //NattableconfigurationFactory
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
deleted file mode 100644
index ff87b38ef5a..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/**
- * 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.model.nattable.nattableconfiguration;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory
- * @model kind="package"
- * @generated
- */
-public interface NattableconfigurationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "nattableconfiguration"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "nattableconfiguration"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	NattableconfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableConfigurationImpl <em>Abstract Table Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getAbstractTableConfiguration()
-	 * @generated
-	 */
-	int ABSTRACT_TABLE_CONFIGURATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Row Axis Provider</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER = 0;
-
-	/**
-	 * The feature id for the '<em><b>Column Axis Provider</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER = 1;
-
-	/**
-	 * The feature id for the '<em><b>Editor Declaration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TABLE_CONFIGURATION__NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION = 4;
-
-	/**
-	 * The number of structural features of the '<em>Abstract Table Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TABLE_CONFIGURATION_FEATURE_COUNT = 5;
-
-	/**
-	 * The number of operations of the '<em>Abstract Table Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TABLE_CONFIGURATION_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl <em>Table Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableConfiguration()
-	 * @generated
-	 */
-	int TABLE_CONFIGURATION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Row Axis Provider</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_CONFIGURATION__ROW_AXIS_PROVIDER = ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER;
-
-	/**
-	 * The feature id for the '<em><b>Column Axis Provider</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER = ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER;
-
-	/**
-	 * The feature id for the '<em><b>Editor Declaration</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_CONFIGURATION__EDITOR_DECLARATION = ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_CONFIGURATION__NAME = ABSTRACT_TABLE_CONFIGURATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_CONFIGURATION__DESCRIPTION = ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_CONFIGURATION__TYPE = ABSTRACT_TABLE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Icon Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_CONFIGURATION__ICON_PATH = ABSTRACT_TABLE_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Creation Tester</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_CONFIGURATION__CREATION_TESTER = ABSTRACT_TABLE_CONFIGURATION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Table Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_CONFIGURATION_FEATURE_COUNT = ABSTRACT_TABLE_CONFIGURATION_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of operations of the '<em>Table Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TABLE_CONFIGURATION_OPERATION_COUNT = ABSTRACT_TABLE_CONFIGURATION_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getCellEditorDeclaration()
-	 * @generated
-	 */
-	int CELL_EDITOR_DECLARATION = 2;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration <em>Abstract Table Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract Table Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration
-	 * @generated
-	 */
-	EClass getAbstractTableConfiguration();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getRowAxisProvider <em>Row Axis Provider</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Row Axis Provider</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getRowAxisProvider()
-	 * @see #getAbstractTableConfiguration()
-	 * @generated
-	 */
-	EReference getAbstractTableConfiguration_RowAxisProvider();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getColumnAxisProvider <em>Column Axis Provider</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Column Axis Provider</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getColumnAxisProvider()
-	 * @see #getAbstractTableConfiguration()
-	 * @generated
-	 */
-	EReference getAbstractTableConfiguration_ColumnAxisProvider();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getEditorDeclaration <em>Editor Declaration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Editor Declaration</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getEditorDeclaration()
-	 * @see #getAbstractTableConfiguration()
-	 * @generated
-	 */
-	EAttribute getAbstractTableConfiguration_EditorDeclaration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getName()
-	 * @see #getAbstractTableConfiguration()
-	 * @generated
-	 */
-	EAttribute getAbstractTableConfiguration_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration#getDescription()
-	 * @see #getAbstractTableConfiguration()
-	 * @generated
-	 */
-	EAttribute getAbstractTableConfiguration_Description();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration <em>Table Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Table Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration
-	 * @generated
-	 */
-	EClass getTableConfiguration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType()
-	 * @see #getTableConfiguration()
-	 * @generated
-	 */
-	EAttribute getTableConfiguration_Type();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Icon Path</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath()
-	 * @see #getTableConfiguration()
-	 * @generated
-	 */
-	EAttribute getTableConfiguration_IconPath();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Creation Tester</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester()
-	 * @see #getTableConfiguration()
-	 * @generated
-	 */
-	EReference getTableConfiguration_CreationTester();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Cell Editor Declaration</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
-	 * @generated
-	 */
-	EEnum getCellEditorDeclaration();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	NattableconfigurationFactory getNattableconfigurationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableConfigurationImpl <em>Abstract Table Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getAbstractTableConfiguration()
-		 * @generated
-		 */
-		EClass ABSTRACT_TABLE_CONFIGURATION = eINSTANCE.getAbstractTableConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Row Axis Provider</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER = eINSTANCE.getAbstractTableConfiguration_RowAxisProvider();
-
-		/**
-		 * The meta object literal for the '<em><b>Column Axis Provider</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER = eINSTANCE.getAbstractTableConfiguration_ColumnAxisProvider();
-
-		/**
-		 * The meta object literal for the '<em><b>Editor Declaration</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION = eINSTANCE.getAbstractTableConfiguration_EditorDeclaration();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ABSTRACT_TABLE_CONFIGURATION__NAME = eINSTANCE.getAbstractTableConfiguration_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION = eINSTANCE.getAbstractTableConfiguration_Description();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl <em>Table Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableConfiguration()
-		 * @generated
-		 */
-		EClass TABLE_CONFIGURATION = eINSTANCE.getTableConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TABLE_CONFIGURATION__TYPE = eINSTANCE.getTableConfiguration_Type();
-
-		/**
-		 * The meta object literal for the '<em><b>Icon Path</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TABLE_CONFIGURATION__ICON_PATH = eINSTANCE.getTableConfiguration_IconPath();
-
-		/**
-		 * The meta object literal for the '<em><b>Creation Tester</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TABLE_CONFIGURATION__CREATION_TESTER = eINSTANCE.getTableConfiguration_CreationTester();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getCellEditorDeclaration()
-		 * @generated
-		 */
-		EEnum CELL_EDITOR_DECLARATION = eINSTANCE.getCellEditorDeclaration();
-
-	}
-
-} //NattableconfigurationPackage
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
deleted file mode 100644
index 3e611ff3e73..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * 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.model.nattable.nattableconfiguration;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Table Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration()
- * @model
- * @generated
- */
-public interface TableConfiguration extends AbstractTableConfiguration {
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(String)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_Type()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Icon Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icon Path</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icon Path</em>' attribute.
-	 * @see #setIconPath(String)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_IconPath()
-	 * @model
-	 * @generated
-	 */
-	String getIconPath();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Icon Path</em>' attribute.
-	 * @see #getIconPath()
-	 * @generated
-	 */
-	void setIconPath(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Creation Tester</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Creation Tester</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Creation Tester</em>' containment reference.
-	 * @see #setCreationTester(AbstractTableTester)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_CreationTester()
-	 * @model containment="true"
-	 * @generated
-	 */
-	AbstractTableTester getCreationTester();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Tester</em>' containment reference.
-	 * @see #getCreationTester()
-	 * @generated
-	 */
-	void setCreationTester(AbstractTableTester value);
-
-} // TableConfiguration
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/AbstractTableConfigurationImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/AbstractTableConfigurationImpl.java
deleted file mode 100644
index d2e4c8b588f..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/AbstractTableConfigurationImpl.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/**
- * 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.model.nattable.nattableconfiguration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Table Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableConfigurationImpl#getRowAxisProvider <em>Row Axis Provider</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableConfigurationImpl#getColumnAxisProvider <em>Column Axis Provider</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableConfigurationImpl#getEditorDeclaration <em>Editor Declaration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableConfigurationImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableConfigurationImpl#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class AbstractTableConfigurationImpl extends 
-MinimalEObjectImpl.Container implements AbstractTableConfiguration {
-	/**
-	 * The cached value of the '{@link #getRowAxisProvider() <em>Row Axis Provider</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRowAxisProvider()
-	 * @generated
-	 * @ordered
-	 */
-	protected AbstractAxisProvider rowAxisProvider;
-
-	/**
-	 * The cached value of the '{@link #getColumnAxisProvider() <em>Column Axis Provider</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColumnAxisProvider()
-	 * @generated
-	 * @ordered
-	 */
-	protected AbstractAxisProvider columnAxisProvider;
-
-	/**
-	 * The default value of the '{@link #getEditorDeclaration() <em>Editor Declaration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEditorDeclaration()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final CellEditorDeclaration EDITOR_DECLARATION_EDEFAULT = CellEditorDeclaration.COLUMN;
-
-	/**
-	 * The cached value of the '{@link #getEditorDeclaration() <em>Editor Declaration</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEditorDeclaration()
-	 * @generated
-	 * @ordered
-	 */
-	protected CellEditorDeclaration editorDeclaration = EDITOR_DECLARATION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractTableConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattableconfigurationPackage.Literals.ABSTRACT_TABLE_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractAxisProvider getRowAxisProvider() {
-		return rowAxisProvider;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRowAxisProvider(AbstractAxisProvider newRowAxisProvider, NotificationChain msgs) {
-		AbstractAxisProvider oldRowAxisProvider = rowAxisProvider;
-		rowAxisProvider = newRowAxisProvider;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER, oldRowAxisProvider, newRowAxisProvider);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRowAxisProvider(AbstractAxisProvider newRowAxisProvider) {
-		if (newRowAxisProvider != rowAxisProvider) {
-			NotificationChain msgs = null;
-			if (rowAxisProvider != null)
-				msgs = ((InternalEObject)rowAxisProvider).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER, null, msgs);
-			if (newRowAxisProvider != null)
-				msgs = ((InternalEObject)newRowAxisProvider).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER, null, msgs);
-			msgs = basicSetRowAxisProvider(newRowAxisProvider, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER, newRowAxisProvider, newRowAxisProvider));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractAxisProvider getColumnAxisProvider() {
-		return columnAxisProvider;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetColumnAxisProvider(AbstractAxisProvider newColumnAxisProvider, NotificationChain msgs) {
-		AbstractAxisProvider oldColumnAxisProvider = columnAxisProvider;
-		columnAxisProvider = newColumnAxisProvider;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER, oldColumnAxisProvider, newColumnAxisProvider);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setColumnAxisProvider(AbstractAxisProvider newColumnAxisProvider) {
-		if (newColumnAxisProvider != columnAxisProvider) {
-			NotificationChain msgs = null;
-			if (columnAxisProvider != null)
-				msgs = ((InternalEObject)columnAxisProvider).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER, null, msgs);
-			if (newColumnAxisProvider != null)
-				msgs = ((InternalEObject)newColumnAxisProvider).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER, null, msgs);
-			msgs = basicSetColumnAxisProvider(newColumnAxisProvider, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER, newColumnAxisProvider, newColumnAxisProvider));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CellEditorDeclaration getEditorDeclaration() {
-		return editorDeclaration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEditorDeclaration(CellEditorDeclaration newEditorDeclaration) {
-		CellEditorDeclaration oldEditorDeclaration = editorDeclaration;
-		editorDeclaration = newEditorDeclaration == null ? EDITOR_DECLARATION_EDEFAULT : newEditorDeclaration;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION, oldEditorDeclaration, editorDeclaration));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER:
-				return basicSetRowAxisProvider(null, msgs);
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER:
-				return basicSetColumnAxisProvider(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER:
-				return getRowAxisProvider();
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER:
-				return getColumnAxisProvider();
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION:
-				return getEditorDeclaration();
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__NAME:
-				return getName();
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION:
-				return getDescription();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER:
-				setRowAxisProvider((AbstractAxisProvider)newValue);
-				return;
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER:
-				setColumnAxisProvider((AbstractAxisProvider)newValue);
-				return;
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION:
-				setEditorDeclaration((CellEditorDeclaration)newValue);
-				return;
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__NAME:
-				setName((String)newValue);
-				return;
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER:
-				setRowAxisProvider((AbstractAxisProvider)null);
-				return;
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER:
-				setColumnAxisProvider((AbstractAxisProvider)null);
-				return;
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION:
-				setEditorDeclaration(EDITOR_DECLARATION_EDEFAULT);
-				return;
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER:
-				return rowAxisProvider != null;
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER:
-				return columnAxisProvider != null;
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION:
-				return editorDeclaration != EDITOR_DECLARATION_EDEFAULT;
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (editorDeclaration: "); //$NON-NLS-1$
-		result.append(editorDeclaration);
-		result.append(", name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(", description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-} //AbstractTableConfigurationImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
deleted file mode 100644
index 30fc3d889bb..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * 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.model.nattable.nattableconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class NattableconfigurationFactoryImpl extends EFactoryImpl implements NattableconfigurationFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static NattableconfigurationFactory init() {
-		try {
-			NattableconfigurationFactory theNattableconfigurationFactory = (NattableconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(NattableconfigurationPackage.eNS_URI);
-			if (theNattableconfigurationFactory != null) {
-				return theNattableconfigurationFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new NattableconfigurationFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableconfigurationFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case NattableconfigurationPackage.TABLE_CONFIGURATION: return createTableConfiguration();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:
-				return createCellEditorDeclarationFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:
-				return convertCellEditorDeclarationToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TableConfiguration createTableConfiguration() {
-		TableConfigurationImpl tableConfiguration = new TableConfigurationImpl();
-		return tableConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CellEditorDeclaration createCellEditorDeclarationFromString(EDataType eDataType, String initialValue) {
-		CellEditorDeclaration result = CellEditorDeclaration.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertCellEditorDeclarationToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableconfigurationPackage getNattableconfigurationPackage() {
-		return (NattableconfigurationPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static NattableconfigurationPackage getPackage() {
-		return NattableconfigurationPackage.eINSTANCE;
-	}
-
-} //NattableconfigurationFactoryImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
deleted file mode 100644
index bfb6aa46261..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/**
- * 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.model.nattable.nattableconfiguration.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationFactory;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class NattableconfigurationPackageImpl extends EPackageImpl implements NattableconfigurationPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass abstractTableConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tableConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum cellEditorDeclarationEEnum = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private NattableconfigurationPackageImpl() {
-		super(eNS_URI, NattableconfigurationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link NattableconfigurationPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static NattableconfigurationPackage init() {
-		if (isInited) return (NattableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI);
-
-		// Obtain or create and register package
-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattableconfigurationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theNattableconfigurationPackage.createPackageContents();
-		theNattablePackage.createPackageContents();
-		theNattableaxisproviderPackage.createPackageContents();
-		theNattablelabelproviderPackage.createPackageContents();
-		theNattableaxisconfigurationPackage.createPackageContents();
-		theNattabletesterPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theNattableconfigurationPackage.initializePackageContents();
-		theNattablePackage.initializePackageContents();
-		theNattableaxisproviderPackage.initializePackageContents();
-		theNattablelabelproviderPackage.initializePackageContents();
-		theNattableaxisconfigurationPackage.initializePackageContents();
-		theNattabletesterPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theNattableconfigurationPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(NattableconfigurationPackage.eNS_URI, theNattableconfigurationPackage);
-		return theNattableconfigurationPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAbstractTableConfiguration() {
-		return abstractTableConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAbstractTableConfiguration_RowAxisProvider() {
-		return (EReference)abstractTableConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAbstractTableConfiguration_ColumnAxisProvider() {
-		return (EReference)abstractTableConfigurationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAbstractTableConfiguration_EditorDeclaration() {
-		return (EAttribute)abstractTableConfigurationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAbstractTableConfiguration_Name() {
-		return (EAttribute)abstractTableConfigurationEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAbstractTableConfiguration_Description() {
-		return (EAttribute)abstractTableConfigurationEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTableConfiguration() {
-		return tableConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTableConfiguration_Type() {
-		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTableConfiguration_IconPath() {
-		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTableConfiguration_CreationTester() {
-		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getCellEditorDeclaration() {
-		return cellEditorDeclarationEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableconfigurationFactory getNattableconfigurationFactory() {
-		return (NattableconfigurationFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		abstractTableConfigurationEClass = createEClass(ABSTRACT_TABLE_CONFIGURATION);
-		createEReference(abstractTableConfigurationEClass, ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER);
-		createEReference(abstractTableConfigurationEClass, ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER);
-		createEAttribute(abstractTableConfigurationEClass, ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION);
-		createEAttribute(abstractTableConfigurationEClass, ABSTRACT_TABLE_CONFIGURATION__NAME);
-		createEAttribute(abstractTableConfigurationEClass, ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION);
-
-		tableConfigurationEClass = createEClass(TABLE_CONFIGURATION);
-		createEAttribute(tableConfigurationEClass, TABLE_CONFIGURATION__TYPE);
-		createEAttribute(tableConfigurationEClass, TABLE_CONFIGURATION__ICON_PATH);
-		createEReference(tableConfigurationEClass, TABLE_CONFIGURATION__CREATION_TESTER);
-
-		// Create enums
-		cellEditorDeclarationEEnum = createEEnum(CELL_EDITOR_DECLARATION);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		NattableaxisproviderPackage theNattableaxisproviderPackage = (NattableaxisproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI);
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-		NattabletesterPackage theNattabletesterPackage = (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		tableConfigurationEClass.getESuperTypes().add(this.getAbstractTableConfiguration());
-
-		// Initialize classes, features, and operations; add parameters
-		initEClass(abstractTableConfigurationEClass, AbstractTableConfiguration.class, "AbstractTableConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getAbstractTableConfiguration_RowAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "rowAxisProvider", null, 1, 1, AbstractTableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getAbstractTableConfiguration_ColumnAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "columnAxisProvider", null, 1, 1, AbstractTableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getAbstractTableConfiguration_EditorDeclaration(), this.getCellEditorDeclaration(), "editorDeclaration", "COLUMN", 1, 1, AbstractTableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getAbstractTableConfiguration_Name(), ecorePackage.getEString(), "name", null, 0, 1, AbstractTableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getAbstractTableConfiguration_Description(), ecorePackage.getEString(), "description", null, 0, 1, AbstractTableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(tableConfigurationEClass, TableConfiguration.class, "TableConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getTableConfiguration_Type(), ecorePackage.getEString(), "type", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getTableConfiguration_IconPath(), theEcorePackage.getEString(), "iconPath", null, 0, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getTableConfiguration_CreationTester(), theNattabletesterPackage.getAbstractTableTester(), null, "creationTester", null, 0, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		// Initialize enums and add enum literals
-		initEEnum(cellEditorDeclarationEEnum, CellEditorDeclaration.class, "CellEditorDeclaration"); //$NON-NLS-1$
-		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.COLUMN);
-		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.ROW);
-		addEEnumLiteral(cellEditorDeclarationEEnum, CellEditorDeclaration.CELL);
-	}
-
-} //NattableconfigurationPackageImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
deleted file mode 100644
index 7f6fd03e828..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/**
- * 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.model.nattable.nattableconfiguration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Table Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getIconPath <em>Icon Path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableConfigurationImpl#getCreationTester <em>Creation Tester</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TableConfigurationImpl extends 
-AbstractTableConfigurationImpl implements TableConfiguration {
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String type = TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIconPath()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ICON_PATH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIconPath()
-	 * @generated
-	 * @ordered
-	 */
-	protected String iconPath = ICON_PATH_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getCreationTester() <em>Creation Tester</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationTester()
-	 * @generated
-	 * @ordered
-	 */
-	protected AbstractTableTester creationTester;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TableConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattableconfigurationPackage.Literals.TABLE_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(String newType) {
-		String oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getIconPath() {
-		return iconPath;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIconPath(String newIconPath) {
-		String oldIconPath = iconPath;
-		iconPath = newIconPath;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH, oldIconPath, iconPath));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractTableTester getCreationTester() {
-		return creationTester;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCreationTester(AbstractTableTester newCreationTester, NotificationChain msgs) {
-		AbstractTableTester oldCreationTester = creationTester;
-		creationTester = newCreationTester;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, oldCreationTester, newCreationTester);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCreationTester(AbstractTableTester newCreationTester) {
-		if (newCreationTester != creationTester) {
-			NotificationChain msgs = null;
-			if (creationTester != null)
-				msgs = ((InternalEObject)creationTester).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);
-			if (newCreationTester != null)
-				msgs = ((InternalEObject)newCreationTester).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, null, msgs);
-			msgs = basicSetCreationTester(newCreationTester, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER, newCreationTester, newCreationTester));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
-				return basicSetCreationTester(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
-				return getType();
-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
-				return getIconPath();
-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
-				return getCreationTester();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
-				setType((String)newValue);
-				return;
-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
-				setIconPath((String)newValue);
-				return;
-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
-				setCreationTester((AbstractTableTester)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
-				setIconPath(ICON_PATH_EDEFAULT);
-				return;
-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
-				setCreationTester((AbstractTableTester)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:
-				return ICON_PATH_EDEFAULT == null ? iconPath != null : !ICON_PATH_EDEFAULT.equals(iconPath);
-			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:
-				return creationTester != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (type: "); //$NON-NLS-1$
-		result.append(type);
-		result.append(", iconPath: "); //$NON-NLS-1$
-		result.append(iconPath);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TableConfigurationImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
deleted file mode 100644
index 4dbac2a3d49..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * 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.model.nattable.nattableconfiguration.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage
- * @generated
- */
-public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static NattableconfigurationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableconfigurationAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = NattableconfigurationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NattableconfigurationSwitch<Adapter> modelSwitch =
-		new NattableconfigurationSwitch<Adapter>() {
-			@Override
-			public Adapter caseAbstractTableConfiguration(AbstractTableConfiguration object) {
-				return createAbstractTableConfigurationAdapter();
-			}
-			@Override
-			public Adapter caseTableConfiguration(TableConfiguration object) {
-				return createTableConfigurationAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration <em>Abstract Table Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration
-	 * @generated
-	 */
-	public Adapter createAbstractTableConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration <em>Table Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration
-	 * @generated
-	 */
-	public Adapter createTableConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //NattableconfigurationAdapterFactory
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
deleted file mode 100644
index 7264d17d77c..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * 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.model.nattable.nattableconfiguration.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage
- * @generated
- */
-public class NattableconfigurationSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static NattableconfigurationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableconfigurationSwitch() {
-		if (modelPackage == null) {
-			modelPackage = NattableconfigurationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION: {
-				AbstractTableConfiguration abstractTableConfiguration = (AbstractTableConfiguration)theEObject;
-				T result = caseAbstractTableConfiguration(abstractTableConfiguration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NattableconfigurationPackage.TABLE_CONFIGURATION: {
-				TableConfiguration tableConfiguration = (TableConfiguration)theEObject;
-				T result = caseTableConfiguration(tableConfiguration);
-				if (result == null) result = caseAbstractTableConfiguration(tableConfiguration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Table Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Abstract Table Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAbstractTableConfiguration(AbstractTableConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Table Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Table Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseTableConfiguration(TableConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //NattableconfigurationSwitch
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
deleted file mode 100644
index 582c6d88cb9..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * 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.model.nattable.nattablelabelprovider;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Feature Label Provider Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration()
- * @model
- * @generated
- */
-public interface FeatureLabelProviderConfiguration extends ObjectLabelProviderConfiguration {
-	/**
-	 * Returns the value of the '<em><b>Display Is Derived</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Is Derived</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Is Derived</em>' attribute.
-	 * @see #setDisplayIsDerived(boolean)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayIsDerived()
-	 * @model default="true" required="true"
-	 * @generated
-	 */
-	boolean isDisplayIsDerived();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Is Derived</em>' attribute.
-	 * @see #isDisplayIsDerived()
-	 * @generated
-	 */
-	void setDisplayIsDerived(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Type</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Type</em>' attribute.
-	 * @see #setDisplayType(boolean)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayType()
-	 * @model default="true" required="true"
-	 * @generated
-	 */
-	boolean isDisplayType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Type</em>' attribute.
-	 * @see #isDisplayType()
-	 * @generated
-	 */
-	void setDisplayType(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Multiplicity</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Multiplicity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Multiplicity</em>' attribute.
-	 * @see #setDisplayMultiplicity(boolean)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayMultiplicity()
-	 * @model default="true" required="true"
-	 * @generated
-	 */
-	boolean isDisplayMultiplicity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Multiplicity</em>' attribute.
-	 * @see #isDisplayMultiplicity()
-	 * @generated
-	 */
-	void setDisplayMultiplicity(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(boolean)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayName()
-	 * @model default="true" required="true"
-	 * @generated
-	 */
-	boolean isDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #isDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(boolean value);
-
-} // FeatureLabelProviderConfiguration
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelConfiguration.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelConfiguration.java
deleted file mode 100644
index e02c0245b86..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelConfiguration.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * 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.model.nattable.nattablelabelprovider;
-
-import org.eclipse.emf.ecore.EModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>ILabel Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration#getLabelProviderContext <em>Label Provider Context</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getILabelConfiguration()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface ILabelConfiguration extends EModelElement {
-	/**
-	 * Returns the value of the '<em><b>Label Provider Context</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Label Provider Context</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Label Provider Context</em>' attribute.
-	 * @see #setLabelProviderContext(String)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getILabelConfiguration_LabelProviderContext()
-	 * @model
-	 * @generated
-	 */
-	String getLabelProviderContext();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration#getLabelProviderContext <em>Label Provider Context</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Label Provider Context</em>' attribute.
-	 * @see #getLabelProviderContext()
-	 * @generated
-	 */
-	void setLabelProviderContext(String value);
-
-} // ILabelConfiguration
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
deleted file mode 100644
index b3b96be8f3c..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * 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.model.nattable.nattablelabelprovider;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage
- * @generated
- */
-public interface NattablelabelproviderFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	NattablelabelproviderFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Feature Label Provider Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Feature Label Provider Configuration</em>'.
-	 * @generated
-	 */
-	FeatureLabelProviderConfiguration createFeatureLabelProviderConfiguration();
-
-	/**
-	 * Returns a new object of class '<em>Object Label Provider Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Object Label Provider Configuration</em>'.
-	 * @generated
-	 */
-	ObjectLabelProviderConfiguration createObjectLabelProviderConfiguration();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	NattablelabelproviderPackage getNattablelabelproviderPackage();
-
-} //NattablelabelproviderFactory
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
deleted file mode 100644
index e7475219bd6..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
+++ /dev/null
@@ -1,525 +0,0 @@
-/**
- * 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.model.nattable.nattablelabelprovider;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory
- * @model kind="package"
- * @generated
- */
-public interface NattablelabelproviderPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "nattablelabelprovider"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "nattablelabelprovider"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	NattablelabelproviderPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration <em>ILabel Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getILabelConfiguration()
-	 * @generated
-	 */
-	int ILABEL_CONFIGURATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ILABEL_CONFIGURATION__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Label Provider Context</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ILABEL_CONFIGURATION__LABEL_PROVIDER_CONTEXT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>ILabel Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ILABEL_CONFIGURATION_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The operation id for the '<em>Get EAnnotation</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ILABEL_CONFIGURATION___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;
-
-	/**
-	 * The number of operations of the '<em>ILabel Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ILABEL_CONFIGURATION_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl <em>Object Label Provider Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getObjectLabelProviderConfiguration()
-	 * @generated
-	 */
-	int OBJECT_LABEL_PROVIDER_CONFIGURATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = ILABEL_CONFIGURATION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Label Provider Context</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT = ILABEL_CONFIGURATION__LABEL_PROVIDER_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Display Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = ILABEL_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Label</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = ILABEL_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Object Label Provider Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = ILABEL_CONFIGURATION_FEATURE_COUNT + 2;
-
-	/**
-	 * The operation id for the '<em>Get EAnnotation</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = ILABEL_CONFIGURATION___GET_EANNOTATION__STRING;
-
-	/**
-	 * The number of operations of the '<em>Object Label Provider Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = ILABEL_CONFIGURATION_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl <em>Feature Label Provider Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getFeatureLabelProviderConfiguration()
-	 * @generated
-	 */
-	int FEATURE_LABEL_PROVIDER_CONFIGURATION = 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Label Provider Context</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT = OBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Display Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Display Label</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL;
-
-	/**
-	 * The feature id for the '<em><b>Display Is Derived</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Display Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Display Multiplicity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Feature Label Provider Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 4;
-
-	/**
-	 * The operation id for the '<em>Get EAnnotation</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING;
-
-	/**
-	 * The number of operations of the '<em>Feature Label Provider Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT + 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration <em>ILabel Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>ILabel Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration
-	 * @generated
-	 */
-	EClass getILabelConfiguration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration#getLabelProviderContext <em>Label Provider Context</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Label Provider Context</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration#getLabelProviderContext()
-	 * @see #getILabelConfiguration()
-	 * @generated
-	 */
-	EAttribute getILabelConfiguration_LabelProviderContext();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration <em>Feature Label Provider Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Feature Label Provider Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration
-	 * @generated
-	 */
-	EClass getFeatureLabelProviderConfiguration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Is Derived</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived()
-	 * @see #getFeatureLabelProviderConfiguration()
-	 * @generated
-	 */
-	EAttribute getFeatureLabelProviderConfiguration_DisplayIsDerived();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Type</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType()
-	 * @see #getFeatureLabelProviderConfiguration()
-	 * @generated
-	 */
-	EAttribute getFeatureLabelProviderConfiguration_DisplayType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Multiplicity</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity()
-	 * @see #getFeatureLabelProviderConfiguration()
-	 * @generated
-	 */
-	EAttribute getFeatureLabelProviderConfiguration_DisplayMultiplicity();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName()
-	 * @see #getFeatureLabelProviderConfiguration()
-	 * @generated
-	 */
-	EAttribute getFeatureLabelProviderConfiguration_DisplayName();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration <em>Object Label Provider Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Object Label Provider Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration
-	 * @generated
-	 */
-	EClass getObjectLabelProviderConfiguration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Icon</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon()
-	 * @see #getObjectLabelProviderConfiguration()
-	 * @generated
-	 */
-	EAttribute getObjectLabelProviderConfiguration_DisplayIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Label</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel()
-	 * @see #getObjectLabelProviderConfiguration()
-	 * @generated
-	 */
-	EAttribute getObjectLabelProviderConfiguration_DisplayLabel();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	NattablelabelproviderFactory getNattablelabelproviderFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration <em>ILabel Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getILabelConfiguration()
-		 * @generated
-		 */
-		EClass ILABEL_CONFIGURATION = eINSTANCE.getILabelConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Label Provider Context</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ILABEL_CONFIGURATION__LABEL_PROVIDER_CONTEXT = eINSTANCE.getILabelConfiguration_LabelProviderContext();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl <em>Feature Label Provider Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getFeatureLabelProviderConfiguration()
-		 * @generated
-		 */
-		EClass FEATURE_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getFeatureLabelProviderConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Is Derived</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayIsDerived();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayType();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Multiplicity</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayMultiplicity();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = eINSTANCE.getFeatureLabelProviderConfiguration_DisplayName();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl <em>Object Label Provider Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getObjectLabelProviderConfiguration()
-		 * @generated
-		 */
-		EClass OBJECT_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getObjectLabelProviderConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Icon</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();
-
-		/**
-		 * The meta object literal for the '<em><b>Display Label</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();
-
-	}
-
-} //NattablelabelproviderPackage
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
deleted file mode 100644
index 8502636bcb8..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * 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.model.nattable.nattablelabelprovider;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Object Label Provider Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration()
- * @model
- * @generated
- */
-public interface ObjectLabelProviderConfiguration extends ILabelConfiguration {
-	/**
-	 * Returns the value of the '<em><b>Display Icon</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Icon</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Icon</em>' attribute.
-	 * @see #setDisplayIcon(boolean)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration_DisplayIcon()
-	 * @model default="true" required="true"
-	 * @generated
-	 */
-	boolean isDisplayIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Icon</em>' attribute.
-	 * @see #isDisplayIcon()
-	 * @generated
-	 */
-	void setDisplayIcon(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Label</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Label</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Label</em>' attribute.
-	 * @see #setDisplayLabel(boolean)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration_DisplayLabel()
-	 * @model default="true" required="true"
-	 * @generated
-	 */
-	boolean isDisplayLabel();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Label</em>' attribute.
-	 * @see #isDisplayLabel()
-	 * @generated
-	 */
-	void setDisplayLabel(boolean value);
-
-} // ObjectLabelProviderConfiguration
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
deleted file mode 100644
index 6c465baa207..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/**
- * 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.model.nattable.nattablelabelprovider.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature Label Provider Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayIsDerived <em>Display Is Derived</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayType <em>Display Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayMultiplicity <em>Display Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.FeatureLabelProviderConfigurationImpl#isDisplayName <em>Display Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FeatureLabelProviderConfigurationImpl extends 
-ObjectLabelProviderConfigurationImpl implements FeatureLabelProviderConfiguration {
-	/**
-	 * The default value of the '{@link #isDisplayIsDerived() <em>Display Is Derived</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayIsDerived()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DISPLAY_IS_DERIVED_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isDisplayIsDerived() <em>Display Is Derived</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayIsDerived()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean displayIsDerived = DISPLAY_IS_DERIVED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DISPLAY_TYPE_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isDisplayType() <em>Display Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayType()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean displayType = DISPLAY_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayMultiplicity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DISPLAY_MULTIPLICITY_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isDisplayMultiplicity() <em>Display Multiplicity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayMultiplicity()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean displayMultiplicity = DISPLAY_MULTIPLICITY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DISPLAY_NAME_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureLabelProviderConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattablelabelproviderPackage.Literals.FEATURE_LABEL_PROVIDER_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDisplayIsDerived() {
-		return displayIsDerived;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayIsDerived(boolean newDisplayIsDerived) {
-		boolean oldDisplayIsDerived = displayIsDerived;
-		displayIsDerived = newDisplayIsDerived;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED, oldDisplayIsDerived, displayIsDerived));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDisplayType() {
-		return displayType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayType(boolean newDisplayType) {
-		boolean oldDisplayType = displayType;
-		displayType = newDisplayType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE, oldDisplayType, displayType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDisplayMultiplicity() {
-		return displayMultiplicity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayMultiplicity(boolean newDisplayMultiplicity) {
-		boolean oldDisplayMultiplicity = displayMultiplicity;
-		displayMultiplicity = newDisplayMultiplicity;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY, oldDisplayMultiplicity, displayMultiplicity));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(boolean newDisplayName) {
-		boolean oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
-				return isDisplayIsDerived();
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
-				return isDisplayType();
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
-				return isDisplayMultiplicity();
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
-				return isDisplayName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
-				setDisplayIsDerived((Boolean)newValue);
-				return;
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
-				setDisplayType((Boolean)newValue);
-				return;
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
-				setDisplayMultiplicity((Boolean)newValue);
-				return;
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
-				setDisplayName((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
-				setDisplayIsDerived(DISPLAY_IS_DERIVED_EDEFAULT);
-				return;
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
-				setDisplayType(DISPLAY_TYPE_EDEFAULT);
-				return;
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
-				setDisplayMultiplicity(DISPLAY_MULTIPLICITY_EDEFAULT);
-				return;
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED:
-				return displayIsDerived != DISPLAY_IS_DERIVED_EDEFAULT;
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE:
-				return displayType != DISPLAY_TYPE_EDEFAULT;
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY:
-				return displayMultiplicity != DISPLAY_MULTIPLICITY_EDEFAULT;
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME:
-				return displayName != DISPLAY_NAME_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (displayIsDerived: "); //$NON-NLS-1$
-		result.append(displayIsDerived);
-		result.append(", displayType: "); //$NON-NLS-1$
-		result.append(displayType);
-		result.append(", displayMultiplicity: "); //$NON-NLS-1$
-		result.append(displayMultiplicity);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //FeatureLabelProviderConfigurationImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
deleted file mode 100644
index fedca1b6480..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * 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.model.nattable.nattablelabelprovider.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements NattablelabelproviderFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static NattablelabelproviderFactory init() {
-		try {
-			NattablelabelproviderFactory theNattablelabelproviderFactory = (NattablelabelproviderFactory)EPackage.Registry.INSTANCE.getEFactory(NattablelabelproviderPackage.eNS_URI);
-			if (theNattablelabelproviderFactory != null) {
-				return theNattablelabelproviderFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new NattablelabelproviderFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattablelabelproviderFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION: return createFeatureLabelProviderConfiguration();
-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION: return createObjectLabelProviderConfiguration();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureLabelProviderConfiguration createFeatureLabelProviderConfiguration() {
-		FeatureLabelProviderConfigurationImpl featureLabelProviderConfiguration = new FeatureLabelProviderConfigurationImpl();
-		return featureLabelProviderConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ObjectLabelProviderConfiguration createObjectLabelProviderConfiguration() {
-		ObjectLabelProviderConfigurationImpl objectLabelProviderConfiguration = new ObjectLabelProviderConfigurationImpl();
-		return objectLabelProviderConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattablelabelproviderPackage getNattablelabelproviderPackage() {
-		return (NattablelabelproviderPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static NattablelabelproviderPackage getPackage() {
-		return NattablelabelproviderPackage.eINSTANCE;
-	}
-
-} //NattablelabelproviderFactoryImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
deleted file mode 100644
index eb3731a6b61..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/**
- * 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.model.nattable.nattablelabelprovider.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class NattablelabelproviderPackageImpl extends EPackageImpl implements NattablelabelproviderPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass iLabelConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass featureLabelProviderConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass objectLabelProviderConfigurationEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private NattablelabelproviderPackageImpl() {
-		super(eNS_URI, NattablelabelproviderFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link NattablelabelproviderPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static NattablelabelproviderPackage init() {
-		if (isInited) return (NattablelabelproviderPackage)EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI);
-
-		// Obtain or create and register package
-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattablelabelproviderPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI) : NattabletesterPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theNattablelabelproviderPackage.createPackageContents();
-		theNattablePackage.createPackageContents();
-		theNattableconfigurationPackage.createPackageContents();
-		theNattableaxisproviderPackage.createPackageContents();
-		theNattableaxisconfigurationPackage.createPackageContents();
-		theNattabletesterPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theNattablelabelproviderPackage.initializePackageContents();
-		theNattablePackage.initializePackageContents();
-		theNattableconfigurationPackage.initializePackageContents();
-		theNattableaxisproviderPackage.initializePackageContents();
-		theNattableaxisconfigurationPackage.initializePackageContents();
-		theNattabletesterPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theNattablelabelproviderPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(NattablelabelproviderPackage.eNS_URI, theNattablelabelproviderPackage);
-		return theNattablelabelproviderPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getILabelConfiguration() {
-		return iLabelConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getILabelConfiguration_LabelProviderContext() {
-		return (EAttribute)iLabelConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFeatureLabelProviderConfiguration() {
-		return featureLabelProviderConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureLabelProviderConfiguration_DisplayIsDerived() {
-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureLabelProviderConfiguration_DisplayType() {
-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureLabelProviderConfiguration_DisplayMultiplicity() {
-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureLabelProviderConfiguration_DisplayName() {
-		return (EAttribute)featureLabelProviderConfigurationEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getObjectLabelProviderConfiguration() {
-		return objectLabelProviderConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getObjectLabelProviderConfiguration_DisplayIcon() {
-		return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getObjectLabelProviderConfiguration_DisplayLabel() {
-		return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattablelabelproviderFactory getNattablelabelproviderFactory() {
-		return (NattablelabelproviderFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		iLabelConfigurationEClass = createEClass(ILABEL_CONFIGURATION);
-		createEAttribute(iLabelConfigurationEClass, ILABEL_CONFIGURATION__LABEL_PROVIDER_CONTEXT);
-
-		featureLabelProviderConfigurationEClass = createEClass(FEATURE_LABEL_PROVIDER_CONFIGURATION);
-		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED);
-		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE);
-		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY);
-		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME);
-
-		objectLabelProviderConfigurationEClass = createEClass(OBJECT_LABEL_PROVIDER_CONFIGURATION);
-		createEAttribute(objectLabelProviderConfigurationEClass, OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON);
-		createEAttribute(objectLabelProviderConfigurationEClass, OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		iLabelConfigurationEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
-		featureLabelProviderConfigurationEClass.getESuperTypes().add(this.getObjectLabelProviderConfiguration());
-		objectLabelProviderConfigurationEClass.getESuperTypes().add(this.getILabelConfiguration());
-
-		// Initialize classes, features, and operations; add parameters
-		initEClass(iLabelConfigurationEClass, ILabelConfiguration.class, "ILabelConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getILabelConfiguration_LabelProviderContext(), theEcorePackage.getEString(), "labelProviderContext", null, 0, 1, ILabelConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(featureLabelProviderConfigurationEClass, FeatureLabelProviderConfiguration.class, "FeatureLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getFeatureLabelProviderConfiguration_DisplayIsDerived(), theEcorePackage.getEBoolean(), "displayIsDerived", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getFeatureLabelProviderConfiguration_DisplayType(), theEcorePackage.getEBoolean(), "displayType", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getFeatureLabelProviderConfiguration_DisplayMultiplicity(), theEcorePackage.getEBoolean(), "displayMultiplicity", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getFeatureLabelProviderConfiguration_DisplayName(), theEcorePackage.getEBoolean(), "displayName", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(objectLabelProviderConfigurationEClass, ObjectLabelProviderConfiguration.class, "ObjectLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getObjectLabelProviderConfiguration_DisplayIcon(), theEcorePackage.getEBoolean(), "displayIcon", "true", 1, 1, ObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getObjectLabelProviderConfiguration_DisplayLabel(), theEcorePackage.getEBoolean(), "displayLabel", "true", 1, 1, ObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-} //NattablelabelproviderPackageImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
deleted file mode 100644
index 3475cf02d35..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/**
- * 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.model.nattable.nattablelabelprovider.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Object Label Provider Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl#getLabelProviderContext <em>Label Provider Context</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl#isDisplayIcon <em>Display Icon</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.ObjectLabelProviderConfigurationImpl#isDisplayLabel <em>Display Label</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ObjectLabelProviderConfigurationImpl extends EModelElementImpl implements ObjectLabelProviderConfiguration {
-	/**
-	 * The default value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLabelProviderContext()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LABEL_PROVIDER_CONTEXT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLabelProviderContext()
-	 * @generated
-	 * @ordered
-	 */
-	protected String labelProviderContext = LABEL_PROVIDER_CONTEXT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDisplayIcon() <em>Display Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DISPLAY_ICON_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isDisplayIcon() <em>Display Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean displayIcon = DISPLAY_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayLabel()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DISPLAY_LABEL_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isDisplayLabel() <em>Display Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDisplayLabel()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean displayLabel = DISPLAY_LABEL_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ObjectLabelProviderConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattablelabelproviderPackage.Literals.OBJECT_LABEL_PROVIDER_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLabelProviderContext() {
-		return labelProviderContext;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLabelProviderContext(String newLabelProviderContext) {
-		String oldLabelProviderContext = labelProviderContext;
-		labelProviderContext = newLabelProviderContext;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT, oldLabelProviderContext, labelProviderContext));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDisplayIcon() {
-		return displayIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayIcon(boolean newDisplayIcon) {
-		boolean oldDisplayIcon = displayIcon;
-		displayIcon = newDisplayIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON, oldDisplayIcon, displayIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDisplayLabel() {
-		return displayLabel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayLabel(boolean newDisplayLabel) {
-		boolean oldDisplayLabel = displayLabel;
-		displayLabel = newDisplayLabel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL, oldDisplayLabel, displayLabel));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT:
-				return getLabelProviderContext();
-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
-				return isDisplayIcon();
-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
-				return isDisplayLabel();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT:
-				setLabelProviderContext((String)newValue);
-				return;
-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
-				setDisplayIcon((Boolean)newValue);
-				return;
-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
-				setDisplayLabel((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT:
-				setLabelProviderContext(LABEL_PROVIDER_CONTEXT_EDEFAULT);
-				return;
-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
-				setDisplayIcon(DISPLAY_ICON_EDEFAULT);
-				return;
-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
-				setDisplayLabel(DISPLAY_LABEL_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT:
-				return LABEL_PROVIDER_CONTEXT_EDEFAULT == null ? labelProviderContext != null : !LABEL_PROVIDER_CONTEXT_EDEFAULT.equals(labelProviderContext);
-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:
-				return displayIcon != DISPLAY_ICON_EDEFAULT;
-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:
-				return displayLabel != DISPLAY_LABEL_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (labelProviderContext: "); //$NON-NLS-1$
-		result.append(labelProviderContext);
-		result.append(", displayIcon: "); //$NON-NLS-1$
-		result.append(displayIcon);
-		result.append(", displayLabel: "); //$NON-NLS-1$
-		result.append(displayLabel);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ObjectLabelProviderConfigurationImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
deleted file mode 100644
index a60673e5eda..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- * 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.model.nattable.nattablelabelprovider.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage
- * @generated
- */
-public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static NattablelabelproviderPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattablelabelproviderAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = NattablelabelproviderPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NattablelabelproviderSwitch<Adapter> modelSwitch =
-		new NattablelabelproviderSwitch<Adapter>() {
-			@Override
-			public Adapter caseILabelConfiguration(ILabelConfiguration object) {
-				return createILabelConfigurationAdapter();
-			}
-			@Override
-			public Adapter caseFeatureLabelProviderConfiguration(FeatureLabelProviderConfiguration object) {
-				return createFeatureLabelProviderConfigurationAdapter();
-			}
-			@Override
-			public Adapter caseObjectLabelProviderConfiguration(ObjectLabelProviderConfiguration object) {
-				return createObjectLabelProviderConfigurationAdapter();
-			}
-			@Override
-			public Adapter caseEModelElement(EModelElement object) {
-				return createEModelElementAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration <em>ILabel Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration
-	 * @generated
-	 */
-	public Adapter createILabelConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration <em>Feature Label Provider Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration
-	 * @generated
-	 */
-	public Adapter createFeatureLabelProviderConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration <em>Object Label Provider Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration
-	 * @generated
-	 */
-	public Adapter createObjectLabelProviderConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EModelElement
-	 * @generated
-	 */
-	public Adapter createEModelElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //NattablelabelproviderAdapterFactory
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
deleted file mode 100644
index 948e2b92372..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * 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.model.nattable.nattablelabelprovider.util;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage
- * @generated
- */
-public class NattablelabelproviderSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static NattablelabelproviderPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattablelabelproviderSwitch() {
-		if (modelPackage == null) {
-			modelPackage = NattablelabelproviderPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case NattablelabelproviderPackage.ILABEL_CONFIGURATION: {
-				ILabelConfiguration iLabelConfiguration = (ILabelConfiguration)theEObject;
-				T result = caseILabelConfiguration(iLabelConfiguration);
-				if (result == null) result = caseEModelElement(iLabelConfiguration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION: {
-				FeatureLabelProviderConfiguration featureLabelProviderConfiguration = (FeatureLabelProviderConfiguration)theEObject;
-				T result = caseFeatureLabelProviderConfiguration(featureLabelProviderConfiguration);
-				if (result == null) result = caseObjectLabelProviderConfiguration(featureLabelProviderConfiguration);
-				if (result == null) result = caseILabelConfiguration(featureLabelProviderConfiguration);
-				if (result == null) result = caseEModelElement(featureLabelProviderConfiguration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION: {
-				ObjectLabelProviderConfiguration objectLabelProviderConfiguration = (ObjectLabelProviderConfiguration)theEObject;
-				T result = caseObjectLabelProviderConfiguration(objectLabelProviderConfiguration);
-				if (result == null) result = caseILabelConfiguration(objectLabelProviderConfiguration);
-				if (result == null) result = caseEModelElement(objectLabelProviderConfiguration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>ILabel Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>ILabel Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseILabelConfiguration(ILabelConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Feature Label Provider Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Feature Label Provider Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFeatureLabelProviderConfiguration(FeatureLabelProviderConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Object Label Provider Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Object Label Provider Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseObjectLabelProviderConfiguration(ObjectLabelProviderConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEModelElement(EModelElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //NattablelabelproviderSwitch
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java
deleted file mode 100644
index 07017b26a57..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * 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.model.nattable.nattabletester;
-
-import org.eclipse.emf.ecore.EModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Table Tester</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getAbstractTableTester()
- * @model abstract="true"
- * @generated
- */
-public interface AbstractTableTester extends EModelElement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	Object getTester();
-
-} // AbstractTableTester
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java
deleted file mode 100644
index 8d2287e382f..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * 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.model.nattable.nattabletester;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java Table Tester</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getJavaTableTester()
- * @model
- * @generated
- */
-public interface JavaTableTester extends AbstractTableTester {
-	/**
-	 * Returns the value of the '<em><b>Tester</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tester</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tester</em>' attribute.
-	 * @see #setTester(String)
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getJavaTableTester_Tester()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getTester();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Tester</em>' attribute.
-	 * @see #getTester()
-	 * @generated
-	 */
-	void setTester(String value);
-
-} // JavaTableTester
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java
deleted file mode 100644
index 46e2ab54104..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * 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.model.nattable.nattabletester;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage
- * @generated
- */
-public interface NattabletesterFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	NattabletesterFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Java Table Tester</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Java Table Tester</em>'.
-	 * @generated
-	 */
-	JavaTableTester createJavaTableTester();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	NattabletesterPackage getNattabletesterPackage();
-
-} //NattabletesterFactory
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
deleted file mode 100644
index 20eac7f008e..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/**
- * 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.model.nattable.nattabletester;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory
- * @model kind="package"
- * @generated
- */
-public interface NattabletesterPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "nattabletester"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/table/nattabletester"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "nattabletester"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	NattabletesterPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl <em>Abstract Table Tester</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getAbstractTableTester()
-	 * @generated
-	 */
-	int ABSTRACT_TABLE_TESTER = 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TABLE_TESTER__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The number of structural features of the '<em>Abstract Table Tester</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TABLE_TESTER_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The operation id for the '<em>Get EAnnotation</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TABLE_TESTER___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;
-
-	/**
-	 * The operation id for the '<em>Get Tester</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TABLE_TESTER___GET_TESTER = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;
-
-	/**
-	 * The number of operations of the '<em>Abstract Table Tester</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TABLE_TESTER_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl <em>Java Table Tester</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getJavaTableTester()
-	 * @generated
-	 */
-	int JAVA_TABLE_TESTER = 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_TABLE_TESTER__EANNOTATIONS = ABSTRACT_TABLE_TESTER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Tester</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_TABLE_TESTER__TESTER = ABSTRACT_TABLE_TESTER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Java Table Tester</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_TABLE_TESTER_FEATURE_COUNT = ABSTRACT_TABLE_TESTER_FEATURE_COUNT + 1;
-
-	/**
-	 * The operation id for the '<em>Get EAnnotation</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_TABLE_TESTER___GET_EANNOTATION__STRING = ABSTRACT_TABLE_TESTER___GET_EANNOTATION__STRING;
-
-	/**
-	 * The operation id for the '<em>Get Tester</em>' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_TABLE_TESTER___GET_TESTER = ABSTRACT_TABLE_TESTER___GET_TESTER;
-
-	/**
-	 * The number of operations of the '<em>Java Table Tester</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_TABLE_TESTER_OPERATION_COUNT = ABSTRACT_TABLE_TESTER_OPERATION_COUNT + 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester <em>Abstract Table Tester</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract Table Tester</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester
-	 * @generated
-	 */
-	EClass getAbstractTableTester();
-
-	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester() <em>Get Tester</em>}' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the '<em>Get Tester</em>' operation.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester#getTester()
-	 * @generated
-	 */
-	EOperation getAbstractTableTester__GetTester();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester <em>Java Table Tester</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Java Table Tester</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester
-	 * @generated
-	 */
-	EClass getJavaTableTester();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester <em>Tester</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Tester</em>'.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester#getTester()
-	 * @see #getJavaTableTester()
-	 * @generated
-	 */
-	EAttribute getJavaTableTester_Tester();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	NattabletesterFactory getNattabletesterFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl <em>Abstract Table Tester</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.AbstractTableTesterImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getAbstractTableTester()
-		 * @generated
-		 */
-		EClass ABSTRACT_TABLE_TESTER = eINSTANCE.getAbstractTableTester();
-
-		/**
-		 * The meta object literal for the '<em><b>Get Tester</b></em>' operation.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EOperation ABSTRACT_TABLE_TESTER___GET_TESTER = eINSTANCE.getAbstractTableTester__GetTester();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl <em>Java Table Tester</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl
-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.NattabletesterPackageImpl#getJavaTableTester()
-		 * @generated
-		 */
-		EClass JAVA_TABLE_TESTER = eINSTANCE.getJavaTableTester();
-
-		/**
-		 * The meta object literal for the '<em><b>Tester</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute JAVA_TABLE_TESTER__TESTER = eINSTANCE.getJavaTableTester_Tester();
-
-	}
-
-} //NattabletesterPackage
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
deleted file mode 100644
index 06c89a75b9f..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * 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.model.nattable.nattabletester.impl;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Table Tester</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class AbstractTableTesterImpl extends EModelElementImpl implements AbstractTableTester {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractTableTesterImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattabletesterPackage.Literals.ABSTRACT_TABLE_TESTER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getTester() {
-		// TODO: implement this method
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
-			case NattabletesterPackage.ABSTRACT_TABLE_TESTER___GET_TESTER:
-				return getTester();
-		}
-		return super.eInvoke(operationID, arguments);
-	}
-
-} //AbstractTableTesterImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java
deleted file mode 100644
index ba7dfd6a22d..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * 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.model.nattable.nattabletester.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java Table Tester</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.impl.JavaTableTesterImpl#getTester <em>Tester</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JavaTableTesterImpl extends AbstractTableTesterImpl implements JavaTableTester {
-	/**
-	 * The default value of the '{@link #getTester() <em>Tester</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTester()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TESTER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTester() <em>Tester</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTester()
-	 * @generated
-	 * @ordered
-	 */
-	protected String tester = TESTER_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JavaTableTesterImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return NattabletesterPackage.Literals.JAVA_TABLE_TESTER;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTester() {
-		return tester;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTester(String newTester) {
-		String oldTester = tester;
-		tester = newTester;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, NattabletesterPackage.JAVA_TABLE_TESTER__TESTER, oldTester, tester));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
-				return getTester();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
-				setTester((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
-				setTester(TESTER_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case NattabletesterPackage.JAVA_TABLE_TESTER__TESTER:
-				return TESTER_EDEFAULT == null ? tester != null : !TESTER_EDEFAULT.equals(tester);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (tester: "); //$NON-NLS-1$
-		result.append(tester);
-		result.append(')');
-		return result.toString();
-	}
-
-} //JavaTableTesterImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java
deleted file mode 100644
index 54d6e4c6e48..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * 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.model.nattable.nattabletester.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class NattabletesterFactoryImpl extends EFactoryImpl implements NattabletesterFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static NattabletesterFactory init() {
-		try {
-			NattabletesterFactory theNattabletesterFactory = (NattabletesterFactory)EPackage.Registry.INSTANCE.getEFactory(NattabletesterPackage.eNS_URI);
-			if (theNattabletesterFactory != null) {
-				return theNattabletesterFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new NattabletesterFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattabletesterFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case NattabletesterPackage.JAVA_TABLE_TESTER: return createJavaTableTester();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaTableTester createJavaTableTester() {
-		JavaTableTesterImpl javaTableTester = new JavaTableTesterImpl();
-		return javaTableTester;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattabletesterPackage getNattabletesterPackage() {
-		return (NattabletesterPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static NattabletesterPackage getPackage() {
-		return NattabletesterPackage.eINSTANCE;
-	}
-
-} //NattabletesterFactoryImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
deleted file mode 100644
index bc9b1de1759..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/**
- * 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.model.nattable.nattabletester.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.NattableaxisconfigurationPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.impl.NattableaxisproviderPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterFactory;
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class NattabletesterPackageImpl extends EPackageImpl implements NattabletesterPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass abstractTableTesterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass javaTableTesterEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private NattabletesterPackageImpl() {
-		super(eNS_URI, NattabletesterFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link NattabletesterPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static NattabletesterPackage init() {
-		if (isInited) return (NattabletesterPackage)EPackage.Registry.INSTANCE.getEPackage(NattabletesterPackage.eNS_URI);
-
-		// Obtain or create and register package
-		NattabletesterPackageImpl theNattabletesterPackage = (NattabletesterPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NattabletesterPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NattabletesterPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-
-		// Obtain or create and register interdependencies
-		NattablePackageImpl theNattablePackage = (NattablePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) instanceof NattablePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablePackage.eNS_URI) : NattablePackage.eINSTANCE);
-		NattableconfigurationPackageImpl theNattableconfigurationPackage = (NattableconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) instanceof NattableconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableconfigurationPackage.eNS_URI) : NattableconfigurationPackage.eINSTANCE);
-		NattableaxisproviderPackageImpl theNattableaxisproviderPackage = (NattableaxisproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) instanceof NattableaxisproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisproviderPackage.eNS_URI) : NattableaxisproviderPackage.eINSTANCE);
-		NattablelabelproviderPackageImpl theNattablelabelproviderPackage = (NattablelabelproviderPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) instanceof NattablelabelproviderPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattablelabelproviderPackage.eNS_URI) : NattablelabelproviderPackage.eINSTANCE);
-		NattableaxisconfigurationPackageImpl theNattableaxisconfigurationPackage = (NattableaxisconfigurationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) instanceof NattableaxisconfigurationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NattableaxisconfigurationPackage.eNS_URI) : NattableaxisconfigurationPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theNattabletesterPackage.createPackageContents();
-		theNattablePackage.createPackageContents();
-		theNattableconfigurationPackage.createPackageContents();
-		theNattableaxisproviderPackage.createPackageContents();
-		theNattablelabelproviderPackage.createPackageContents();
-		theNattableaxisconfigurationPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theNattabletesterPackage.initializePackageContents();
-		theNattablePackage.initializePackageContents();
-		theNattableconfigurationPackage.initializePackageContents();
-		theNattableaxisproviderPackage.initializePackageContents();
-		theNattablelabelproviderPackage.initializePackageContents();
-		theNattableaxisconfigurationPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theNattabletesterPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(NattabletesterPackage.eNS_URI, theNattabletesterPackage);
-		return theNattabletesterPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAbstractTableTester() {
-		return abstractTableTesterEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EOperation getAbstractTableTester__GetTester() {
-		return abstractTableTesterEClass.getEOperations().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJavaTableTester() {
-		return javaTableTesterEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJavaTableTester_Tester() {
-		return (EAttribute)javaTableTesterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattabletesterFactory getNattabletesterFactory() {
-		return (NattabletesterFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		abstractTableTesterEClass = createEClass(ABSTRACT_TABLE_TESTER);
-		createEOperation(abstractTableTesterEClass, ABSTRACT_TABLE_TESTER___GET_TESTER);
-
-		javaTableTesterEClass = createEClass(JAVA_TABLE_TESTER);
-		createEAttribute(javaTableTesterEClass, JAVA_TABLE_TESTER__TESTER);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		abstractTableTesterEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
-		javaTableTesterEClass.getESuperTypes().add(this.getAbstractTableTester());
-
-		// Initialize classes, features, and operations; add parameters
-		initEClass(abstractTableTesterEClass, AbstractTableTester.class, "AbstractTableTester", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEOperation(getAbstractTableTester__GetTester(), ecorePackage.getEJavaObject(), "getTester", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(javaTableTesterEClass, JavaTableTester.class, "JavaTableTester", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getJavaTableTester_Tester(), ecorePackage.getEString(), "tester", null, 1, 1, JavaTableTester.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-	}
-
-} //NattabletesterPackageImpl
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java
deleted file mode 100644
index a6b7df87f1f..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * 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.model.nattable.nattabletester.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage
- * @generated
- */
-public class NattabletesterAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static NattabletesterPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattabletesterAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = NattabletesterPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NattabletesterSwitch<Adapter> modelSwitch =
-		new NattabletesterSwitch<Adapter>() {
-			@Override
-			public Adapter caseAbstractTableTester(AbstractTableTester object) {
-				return createAbstractTableTesterAdapter();
-			}
-			@Override
-			public Adapter caseJavaTableTester(JavaTableTester object) {
-				return createJavaTableTesterAdapter();
-			}
-			@Override
-			public Adapter caseEModelElement(EModelElement object) {
-				return createEModelElementAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester <em>Abstract Table Tester</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester
-	 * @generated
-	 */
-	public Adapter createAbstractTableTesterAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester <em>Java Table Tester</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.JavaTableTester
-	 * @generated
-	 */
-	public Adapter createJavaTableTesterAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EModelElement
-	 * @generated
-	 */
-	public Adapter createEModelElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //NattabletesterAdapterFactory
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java
deleted file mode 100644
index c683d173144..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * 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.model.nattable.nattabletester.util;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage
- * @generated
- */
-public class NattabletesterSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static NattabletesterPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattabletesterSwitch() {
-		if (modelPackage == null) {
-			modelPackage = NattabletesterPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case NattabletesterPackage.ABSTRACT_TABLE_TESTER: {
-				AbstractTableTester abstractTableTester = (AbstractTableTester)theEObject;
-				T result = caseAbstractTableTester(abstractTableTester);
-				if (result == null) result = caseEModelElement(abstractTableTester);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NattabletesterPackage.JAVA_TABLE_TESTER: {
-				JavaTableTester javaTableTester = (JavaTableTester)theEObject;
-				T result = caseJavaTableTester(javaTableTester);
-				if (result == null) result = caseAbstractTableTester(javaTableTester);
-				if (result == null) result = caseEModelElement(javaTableTester);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Table Tester</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Abstract Table Tester</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAbstractTableTester(AbstractTableTester object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Java Table Tester</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Java Table Tester</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseJavaTableTester(JavaTableTester object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEModelElement(EModelElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //NattabletesterSwitch
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
deleted file mode 100644
index 85f98d4d0ca..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/**
- * 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.model.nattable.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.*;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage
- * @generated
- */
-public class NattableAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static NattablePackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = NattablePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NattableSwitch<Adapter> modelSwitch =
-		new NattableSwitch<Adapter>() {
-			@Override
-			public Adapter caseTable(Table object) {
-				return createTableAdapter();
-			}
-			@Override
-			public Adapter caseIAxis(IAxis object) {
-				return createIAxisAdapter();
-			}
-			@Override
-			public Adapter caseIdAxis(IdAxis object) {
-				return createIdAxisAdapter();
-			}
-			@Override
-			public Adapter caseEObjectAxis(EObjectAxis object) {
-				return createEObjectAxisAdapter();
-			}
-			@Override
-			public Adapter caseAbstractTableConfiguration(AbstractTableConfiguration object) {
-				return createAbstractTableConfigurationAdapter();
-			}
-			@Override
-			public Adapter caseEModelElement(EModelElement object) {
-				return createEModelElementAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table <em>Table</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table
-	 * @generated
-	 */
-	public Adapter createTableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.IAxis <em>IAxis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.IAxis
-	 * @generated
-	 */
-	public Adapter createIAxisAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis <em>Id Axis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis
-	 * @generated
-	 */
-	public Adapter createIdAxisAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis <em>EObject Axis</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis
-	 * @generated
-	 */
-	public Adapter createEObjectAxisAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EModelElement
-	 * @generated
-	 */
-	public Adapter createEModelElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration <em>Abstract Table Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration
-	 * @generated
-	 */
-	public Adapter createAbstractTableConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //NattableAdapterFactory
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
deleted file mode 100644
index 3550f7ef88f..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
- * 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.model.nattable.util;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.*;
-
-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage
- * @generated
- */
-public class NattableSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static NattablePackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NattableSwitch() {
-		if (modelPackage == null) {
-			modelPackage = NattablePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case NattablePackage.TABLE: {
-				Table table = (Table)theEObject;
-				T result = caseTable(table);
-				if (result == null) result = caseAbstractTableConfiguration(table);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NattablePackage.IAXIS: {
-				IAxis iAxis = (IAxis)theEObject;
-				T result = caseIAxis(iAxis);
-				if (result == null) result = caseEModelElement(iAxis);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NattablePackage.ID_AXIS: {
-				IdAxis idAxis = (IdAxis)theEObject;
-				T result = caseIdAxis(idAxis);
-				if (result == null) result = caseIAxis(idAxis);
-				if (result == null) result = caseEModelElement(idAxis);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case NattablePackage.EOBJECT_AXIS: {
-				EObjectAxis eObjectAxis = (EObjectAxis)theEObject;
-				T result = caseEObjectAxis(eObjectAxis);
-				if (result == null) result = caseIAxis(eObjectAxis);
-				if (result == null) result = caseEModelElement(eObjectAxis);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Table</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Table</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseTable(Table object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>IAxis</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>IAxis</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseIAxis(IAxis object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Id Axis</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Id Axis</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseIdAxis(IdAxis object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject Axis</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject Axis</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEObjectAxis(EObjectAxis object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEModelElement(EModelElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Table Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Abstract Table Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAbstractTableConfiguration(AbstractTableConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //NattableSwitch
diff --git a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/tablemetamodeldocumentation.mediawiki b/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/tablemetamodeldocumentation.mediawiki
deleted file mode 100644
index 1564bbf26e5..00000000000
--- a/sandbox/TableV3-modelV2/org.eclipse.papyrus.infra.nattable.model/tablemetamodeldocumentation.mediawiki
+++ /dev/null
@@ -1,80 +0,0 @@
-=Metamodel Description= 
-==CellEditorDeclaration==
-This enumeration allows to describe the way to declare the cell editor in the table : 
-<li>by column </li>
-<li>by row </li>
-<li>by cell </li>
-
-==AxisIndexStyle==
-This enumeration allows to describe how to display the index of the axis : 
-<li>Alphabetic : A, B, C ... Y, Z, AA, AB, ... </li>
-<li>Numeric : 1, 2, 3 </li>
-
-==TableNamedElement==
-abstract object used when an element need to have a name and a description
-
-==TableConfiguration==
-this object is used to configure the table
-
-===Fields=== 
- <li>type : the type of the table</li>
- <li>iconPath : the icon associated to the table</li>
- <li>cellEditorDeclaration : describe how the cell editor will be declared in the table : They can be declared by row, by column or by cells</li>
- <li>rowAxisProviders : the possible axis providers used for rows for this configuration</li>
- <li>columnAxisProviders : the possible axis providers used for the columns for this configuration</li>
- <li>defaultRowAxisProvider : the axis provider used for row just after the table creation </li>
- <li>defaultColumnAxisProvider : the axis provider used for column just after the table creation </li>
- 
- 
- ????rowAxisProviderConfiguration -> a la bonne place ? -> peut-�tre sur un (local)AbstractAxisProvider?
- ????columnAxisProviderConfiguration -> � la bonne place? -> peut-�tre sur un (local)AbstractAxisProvider?
- 
- ===Constraints===
- the field defaultRowAxisProvider must references an axis owned by rowAxisProviders
- the field defaultColumnAxisProvider must references an axis owned by columnAxisProviders
-  
-
-==Table==
-This object represents the model of the table used in Papyrus
-===Fields===
-<li>invertAxis : indicates if the rows and the columns are inverted</li>
-<li>tableConfiguration : the configuration used for the table</li>
-<li>currentColumnAxisProvider : the current axis provider used for columns</li>
-<li>currentRowAxisProvider : the current axis provider used for rows</li>
-<li>rowAxisProvidersHistory : an history of the axis provider used for rows</li>
-<li>columnAxisProvidersHistory : an history of the axis provider used for columns</li>
- 
-===Constraints===
-<li>the field currentRowAxisProvider must references an axis owned by rowAxisProviderHistory</li>
-<li>The field currentColumnAxisProvider must references one of axis provider referenced by columnAxisProviderHistory </li>
-<li>the field rowAxisProviderHistory will contains only 1 axisProvider just after the table creation even if the config provides several row axis providers in rowAxisProviders</li>
-<li>the field columnAxisProviderHistory will contains only 1 axisProvider just after the table creation even if the config provides several column axis providers in columnAxisProviders</li>
-<li> the axis providers owned by columnAxisProviderHistory and rowAxisProviderHistory contains only the axis provider already used by the user. </li>
-
-
-??? localTableConfiguration : must be here?
-
-??? add header in the name of the label configuration????
-==AbstractLabelConfiguration==
-This object allows to store the configuration for the label provider.
-===Fields===
-<li>labelProviderContext : the context to use to find the label provider to use</li>
-
-
-==ObjectLabelProviderConfiguration==
-This label provider can be used for all element displayed in a table
-===Fields===
-<li>displayIcon : indicates if we want display the icon of the object in the header</li>
-<li>displayLabel : indicates if we want display the label of the object in the header</li>
-
-==FeatureLabelProviderConfiguration==
-The label provider used for object representing properties/features of others objects
-===Fields===
-<li>displayIsDerived: indicates if we want display the "/" for the derived feature</li>
-<li>displayType: indicates if we want display the type of the feature</li>
-<li>displayMultiplicity: : indicates if we want display the multiplicity of the feature</li>
-<li>displayName:indicates if the want display the name of the feature</li>
-
-
-==AbstractAxisProvider==
-This class stores in an ordered list the IAxis displayed in rows or in columns
-\ No newline at end of file