404531: [Table 2] Metamodel must be refactored

https://bugs.eclipse.org/bugs/show_bug.cgi?id=404531

94 files changed, 3205 insertions, 2450 deletions

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EStructuralFeatureAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EStructuralFeatureAxisManager.java
index ae903066c9a..bba13274634 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EStructuralFeatureAxisManager.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EStructuralFeatureAxisManager.java
@@ -187,5 +187,4 @@ public class EStructuralFeatureAxisManager extends AbstractAxisManager {
 		}

 		return eObjects;

 	}

-

 }

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java
index 854a1f0c978..5797e56bfa4 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java
@@ -20,8 +20,8 @@ import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
 import org.eclipse.nebula.widgets.nattable.layer.LabelStack;

 import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider;

 import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement;

 import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElement;

@@ -76,7 +76,7 @@ public class EMFEObjectHeaderLabelProvider extends AbstractNattableCellLabelProv
 				conf = manager.getRowAxisConfiguration().getLabelConfiguration();

 			}

 		}

-		if(conf instanceof EObjectLabelProviderConfiguration && !((EObjectLabelProviderConfiguration)conf).isDisplayLabel()) {

+		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayLabel()) {

 			return "";

 		}

 		return serv.getLabelProvider(object).getText(object);

@@ -105,7 +105,7 @@ public class EMFEObjectHeaderLabelProvider extends AbstractNattableCellLabelProv
 			}

 

 		}

-		if(conf instanceof EObjectLabelProviderConfiguration && !((EObjectLabelProviderConfiguration)conf).isDisplayIcon()) {

+		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayIcon()) {

 			return null;

 		}

 		return serv.getLabelProvider(object).getImage(object);

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFFeatureHeaderLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFFeatureHeaderLabelProvider.java
index 522a3f6383a..62ce09d75e5 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFFeatureHeaderLabelProvider.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFFeatureHeaderLabelProvider.java
@@ -23,9 +23,9 @@ import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
 import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

 import org.eclipse.papyrus.infra.emf.nattable.registry.EStructuralFeatureImageRegistry;

 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration;

 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.ObjectLabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement;

 import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElement;

 import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

@@ -158,7 +158,7 @@ public class EMFFeatureHeaderLabelProvider extends EMFEObjectHeaderLabelProvider
 			}

 

 		}

-		if(conf instanceof EObjectLabelProviderConfiguration && !((EObjectLabelProviderConfiguration)conf).isDisplayLabel()) {

+		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayLabel()) {

 			return "";

 		}

 		if(conf instanceof FeatureLabelProviderConfiguration) {

@@ -189,7 +189,7 @@ public class EMFFeatureHeaderLabelProvider extends EMFEObjectHeaderLabelProvider
 			}

 

 		}

-		if(conf instanceof EObjectLabelProviderConfiguration && !((EObjectLabelProviderConfiguration)conf).isDisplayIcon()) {

+		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayIcon()) {

 			return null;

 		}

 		final EStructuralFeature feature = (EStructuralFeature)((ILabelProviderContextElement)element).getObject();

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java
index c73356b82eb..00594afd4aa 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java
@@ -26,8 +26,8 @@ import org.eclipse.papyrus.infra.nattable.Activator;
 import org.eclipse.papyrus.infra.nattable.common.utils.TableEditorInput;

 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

 import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-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.NattableconfigurationPackage;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.ui.IEditorInput;

@@ -173,7 +173,7 @@ public abstract class AbstractEMFNattableEditor extends EditorPart {
 			 */

 			@Override

 			public void notifyChanged(final Notification notification) {

-				if(notification.getFeature() == NattablePackage.eINSTANCE.getTable_Name()) {

+				if(notification.getFeature() == NattableconfigurationPackage.eINSTANCE.getAbstractTableConfiguration_Name()) {

 					setPartName(PartNameSynchronizer.this.papyrusTable.getName());

 				}

 			}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/AbstractNattableEditorFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/AbstractNattableEditorFactory.java
index 8b937fb8e97..bd6c86b6fbd 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/AbstractNattableEditorFactory.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/factory/AbstractNattableEditorFactory.java
@@ -72,7 +72,7 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor
 	 */

 	public boolean isPageModelFactoryFor(Object pageIdentifier) {

 		if(pageIdentifier instanceof Table) {

-			return getExpectedType().equals(((Table)pageIdentifier).getEditorConfiguration().getType());

+			return getExpectedType().equals(((Table)pageIdentifier).getEditorConfiguration().getType().trim());

 		}

 		return false;

 	}

@@ -106,7 +106,7 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor
 		 * Constructor.

 		 */

 		public NattableEditorModel(Object pageIdentifier, ServicesRegistry servicesRegistry) {

-			rawModel = (Table)pageIdentifier;

+			this.rawModel = (Table)pageIdentifier;

 			this.servicesRegistry = servicesRegistry;

 		}

 

@@ -122,10 +122,10 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor
 			try {

 

 				Constructor<?> c = getDiagramClass().getConstructor(ServicesRegistry.class, Table.class);

-				IEditorPart newEditor = (IEditorPart)c.newInstance(servicesRegistry, rawModel);

+				IEditorPart newEditor = (IEditorPart)c.newInstance(this.servicesRegistry, this.rawModel);

 				//	IEditorPart newEditor = new DefaultNattableEditor(getServiceRegistry(), rawModel);

-				editor = newEditor;

-				return editor;

+				this.editor = newEditor;

+				return this.editor;

 

 			} catch (Exception e) {

 				// Lets propagate. This is an implementation problem that should be solved by

@@ -144,7 +144,7 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor
 		 */

 		public EditorActionBarContributor getActionBarContributor() {

 

-			String actionBarId = editorDescriptor.getActionBarContributorId();

+			String actionBarId = AbstractNattableEditorFactory.this.editorDescriptor.getActionBarContributorId();

 

 			// Do nothing if no EditorActionBarContributor is specify.

 			if(actionBarId == null || actionBarId.length() == 0) {

@@ -157,7 +157,7 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor
 			// ServicesRegistry serviceRegistry = getServicesRegistry();

 			ActionBarContributorRegistry registry;

 			try {

-				registry = servicesRegistry.getService(ActionBarContributorRegistry.class);

+				registry = this.servicesRegistry.getService(ActionBarContributorRegistry.class);

 			} catch (ServiceException e) {

 				// Service not found

 				Activator.log.error(e);

@@ -180,7 +180,7 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor
 		 * 

 		 */

 		public Object getRawModel() {

-			return rawModel;

+			return this.rawModel;

 		}

 

 		/**

@@ -192,8 +192,9 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor
 		 */

 		public Image getTabIcon() {

 			ImageDescriptor imageDescriptor = getEditorDescriptor().getIcon();

-			if(imageDescriptor == null)

+			if(imageDescriptor == null) {

 				return null;

+			}

 

 			return imageDescriptor.createImage();

 		}

@@ -206,7 +207,7 @@ public abstract class AbstractNattableEditorFactory extends AbstractEditorFactor
 		 * 

 		 */

 		public String getTabTitle() {

-			return rawModel.getName();

+			return this.rawModel.getName();

 		}

 	}

 }

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java
index 16485f0ab2b..424e9cb313f 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java
@@ -47,7 +47,8 @@ import org.eclipse.papyrus.infra.nattable.common.modelresource.PapyrusNattableMo
 import org.eclipse.papyrus.infra.nattable.messages.Messages;

 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.TableEditorConfiguration;

+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.utils.TableHelper;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.ui.IWorkbenchWindow;

@@ -113,7 +114,7 @@ public abstract class AbstractCreateNattableEditorHandler extends AbstractHandle
 	public void runAsTransaction(final ExecutionEvent event) throws ServiceException {

 		// default Value

 		final String name;

-		final String nameWithIncrement = EditorNameInitializer.getNameWithIncrement(NattablePackage.eINSTANCE.getTable(), NattablePackage.eINSTANCE.getTable_Name(), this.defaultName, getTableContext());

+		final String nameWithIncrement = EditorNameInitializer.getNameWithIncrement(NattablePackage.eINSTANCE.getTable(), NattableconfigurationPackage.eINSTANCE.getAbstractTableConfiguration_Name(), this.defaultName, getTableContext());

 		final InputDialog dialog = new InputDialog(Display.getDefault().getActiveShell(), Messages.AbstractCreateNattableEditorHandler_PapyrusTableCreation, Messages.AbstractCreateNattableEditorHandler_EnterTheNameForTheNewTable, nameWithIncrement, null);

 		if(dialog.open() == Dialog.OK) {

 			name = dialog.getValue();

@@ -164,7 +165,7 @@ public abstract class AbstractCreateNattableEditorHandler extends AbstractHandle
 	 *         The model where to save the TableInstance is not found.

 	 */

 	protected Object createEditorModel(final ServicesRegistry serviceRegistry, String name, String description) throws ServiceException, NotFoundException {

-		final TableEditorConfiguration configuration = getDefaultTableEditorConfiguration();

+		final TableConfiguration configuration = getDefaultTableEditorConfiguration();

 		assert configuration != null;

 

 		final Table table = TableHelper.createTable(configuration, getTableContext(), name, description);

@@ -180,13 +181,13 @@ public abstract class AbstractCreateNattableEditorHandler extends AbstractHandle
 	 * @return

 	 *         the configuration to use for the new table

 	 */

-	protected TableEditorConfiguration getDefaultTableEditorConfiguration() {

+	protected TableConfiguration getDefaultTableEditorConfiguration() {

 		final EObject current = getSelection().get(0);

 		final ResourceSet resourceSet = current.eResource().getResourceSet();

 		final Resource resource = resourceSet.getResource(getTableEditorConfigurationURI(), true);

-		TableEditorConfiguration tableConfiguration = null;

-		if(resource.getContents().get(0) instanceof TableEditorConfiguration) {

-			tableConfiguration = (TableEditorConfiguration)resource.getContents().get(0);

+		TableConfiguration tableConfiguration = null;

+		if(resource.getContents().get(0) instanceof TableConfiguration) {

+			tableConfiguration = (TableConfiguration)resource.getContents().get(0);

 		}

 		return tableConfiguration;

 	}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_ObjectLabelProviderConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_ObjectLabelProviderConfiguration.gif
new file mode 100644
index 00000000000..c06a860ddcd
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_ObjectLabelProviderConfiguration.gif
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableCreationTester.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableCreationTester.gif
new file mode 100644
index 00000000000..7b611480bea
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableCreationTester.gif
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableConfiguration.gif
new file mode 100644
index 00000000000..207b658fbb9
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableConfiguration.gif
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableCreationTester.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableCreationTester.gif
new file mode 100644
index 00000000000..b3643da048a
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableCreationTester.gif
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectLabelProviderConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectLabelProviderConfiguration.gif
new file mode 100644
index 00000000000..db7414e9372
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectLabelProviderConfiguration.gif
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableConfiguration.gif b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableConfiguration.gif
new file mode 100644
index 00000000000..90d10f94707
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableConfiguration.gif
diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
index 4a6e089a9d2..2952df5512a 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
@@ -113,3 +113,13 @@ _UI_AbstractTableConfiguration_columnAxisProvider_feature = Column Axis Provider
 _UI_AbstractTableConfiguration_editorDeclaration_feature = Editor Declaration

 _UI_AbstractTableConfiguration_name_feature = Name

 _UI_AbstractTableConfiguration_description_feature = Description

+_UI_TableConfiguration_type = Table Configuration

+_UI_TableConfiguration_type_feature = Type

+_UI_TableConfiguration_iconPath_feature = Icon Path

+_UI_ObjectLabelProviderConfiguration_type = Object Label Provider Configuration

+_UI_ObjectLabelProviderConfiguration_displayIcon_feature = Display Icon

+_UI_ObjectLabelProviderConfiguration_displayLabel_feature = Display Label

+_UI_AbstractTableCreationTester_type = Abstract Table Creation Tester

+_UI_JavaTableCreationTester_type = Java Table Creation Tester

+_UI_TableConfiguration_creationTester_feature = Creation Tester

+_UI_JavaTableCreationTester_tester_feature = Tester

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractAxisConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractAxisConfigurationItemProvider.java
index df1def9df5c..f12aeb4a46b 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractAxisConfigurationItemProvider.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractAxisConfigurationItemProvider.java
@@ -164,7 +164,7 @@ public class AbstractAxisConfigurationItemProvider
 		newChildDescriptors.add

 			(createChildParameter

 				(NattableaxisconfigurationPackage.Literals.ABSTRACT_AXIS_CONFIGURATION__LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createEObjectLabelProviderConfiguration()));

+				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

 

 		newChildDescriptors.add

 			(createChildParameter

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/DefaultAxisConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/DefaultAxisConfigurationItemProvider.java
index 1be1bd0408a..1cb47a3d522 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/DefaultAxisConfigurationItemProvider.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/DefaultAxisConfigurationItemProvider.java
@@ -15,8 +15,10 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurat
 

 import java.util.Collection;

 import java.util.List;

+

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

@@ -26,6 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ViewerNotification;

+

 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;

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
index 55ab91845e0..9eb9b407dac 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
@@ -15,11 +15,16 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.p
 

 import java.util.Collection;

 import java.util.List;

+

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.common.util.ResourceLocator;

+

 import org.eclipse.emf.ecore.EStructuralFeature;

+

 import org.eclipse.emf.ecore.provider.EModelElementItemProvider;

+

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

@@ -29,9 +34,12 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ViewerNotification;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

 

 /**

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/DefaultAxisProviderItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/DefaultAxisProviderItemProvider.java
index fabb53b05be..54ba048d6b3 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/DefaultAxisProviderItemProvider.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/DefaultAxisProviderItemProvider.java
@@ -161,12 +161,12 @@ public class DefaultAxisProviderItemProvider
 		newChildDescriptors.add

 			(createChildParameter

 				(NattableaxisproviderPackage.Literals.DEFAULT_AXIS_PROVIDER__AXIS,

-				 NattableFactory.eINSTANCE.createEObjectAxis()));

+				 NattableFactory.eINSTANCE.createIdAxis()));

 

 		newChildDescriptors.add

 			(createChildParameter

 				(NattableaxisproviderPackage.Literals.DEFAULT_AXIS_PROVIDER__AXIS,

-				 NattableFactory.eINSTANCE.createIdAxis()));

+				 NattableFactory.eINSTANCE.createEObjectAxis()));

 	}

 

 }

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/AbstractTableCreationTesterItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/AbstractTableCreationTesterItemProvider.java
new file mode 100644
index 00000000000..f1133f1d0d0
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/AbstractTableCreationTesterItemProvider.java
@@ -0,0 +1,120 @@
+/**

+ * 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.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.common.util.ResourceLocator;

+

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableCreationTester} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class AbstractTableCreationTesterItemProvider

+	extends ItemProviderAdapter

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public AbstractTableCreationTesterItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		return getString("_UI_AbstractTableCreationTester_type"); //$NON-NLS-1$

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return NattableEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/JavaTableCreationTesterItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/JavaTableCreationTesterItemProvider.java
new file mode 100644
index 00000000000..fbb0f7c9b17
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/JavaTableCreationTesterItemProvider.java
@@ -0,0 +1,153 @@
+/**

+ * 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.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.JavaTableCreationTester;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.JavaTableCreationTester} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class JavaTableCreationTesterItemProvider

+	extends AbstractTableCreationTesterItemProvider

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public JavaTableCreationTesterItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addTesterPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Tester feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addTesterPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_JavaTableCreationTester_tester_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_JavaTableCreationTester_tester_feature", "_UI_JavaTableCreationTester_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableconfigurationPackage.Literals.JAVA_TABLE_CREATION_TESTER__TESTER,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This returns JavaTableCreationTester.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/JavaTableCreationTester")); //$NON-NLS-1$

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((JavaTableCreationTester)object).getTester();

+		return label == null || label.length() == 0 ?

+			getString("_UI_JavaTableCreationTester_type") : //$NON-NLS-1$

+			getString("_UI_JavaTableCreationTester_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch (notification.getFeatureID(JavaTableCreationTester.class)) {

+			case NattableconfigurationPackage.JAVA_TABLE_CREATION_TESTER__TESTER:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
index 67a54d2c3dd..9edd5303e14 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
@@ -82,26 +82,49 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration} instances.

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	protected TableEditorConfigurationItemProvider tableEditorConfigurationItemProvider;

+	protected TableConfigurationItemProvider tableConfigurationItemProvider;

 

 	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration}.

+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	@Override

-	public Adapter createTableEditorConfigurationAdapter() {

-		if (tableEditorConfigurationItemProvider == null) {

-			tableEditorConfigurationItemProvider = new TableEditorConfigurationItemProvider(this);

+	public Adapter createTableConfigurationAdapter() {

+		if (tableConfigurationItemProvider == null) {

+			tableConfigurationItemProvider = new TableConfigurationItemProvider(this);

 		}

 

-		return tableEditorConfigurationItemProvider;

+		return tableConfigurationItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.JavaTableCreationTester} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected JavaTableCreationTesterItemProvider javaTableCreationTesterItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.JavaTableCreationTester}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createJavaTableCreationTesterAdapter() {

+		if (javaTableCreationTesterItemProvider == null) {

+			javaTableCreationTesterItemProvider = new JavaTableCreationTesterItemProvider(this);

+		}

+

+		return javaTableCreationTesterItemProvider;

 	}

 

 	/**

@@ -203,7 +226,8 @@ public class NattableconfigurationItemProviderAdapterFactory extends Nattablecon
 	 * @generated

 	 */

 	public void dispose() {

-		if (tableEditorConfigurationItemProvider != null) tableEditorConfigurationItemProvider.dispose();

+		if (tableConfigurationItemProvider != null) tableConfigurationItemProvider.dispose();

+		if (javaTableCreationTesterItemProvider != null) javaTableCreationTesterItemProvider.dispose();

 	}

 

 }

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableEditorConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java
index 8452e23a819..f0fd29cc88e 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableEditorConfigurationItemProvider.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java
@@ -19,12 +19,7 @@ import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

 

-import org.eclipse.emf.common.util.ResourceLocator;

-

 import org.eclipse.emf.ecore.EStructuralFeature;

-

-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;

-

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

@@ -35,22 +30,18 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ViewerNotification;

 

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;

-

-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.TableEditorConfiguration;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

 

 /**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration} object.

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

  */

-public class TableEditorConfigurationItemProvider

-	extends EModelElementItemProvider

+public class TableConfigurationItemProvider

+	extends AbstractTableConfigurationItemProvider

 	implements

 		IEditingDomainItemProvider,

 		IStructuredItemContentProvider,

@@ -63,7 +54,7 @@ public class TableEditorConfigurationItemProvider
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public TableEditorConfigurationItemProvider(AdapterFactory adapterFactory) {

+	public TableConfigurationItemProvider(AdapterFactory adapterFactory) {

 		super(adapterFactory);

 	}

 

@@ -78,26 +69,26 @@ public class TableEditorConfigurationItemProvider
 		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

-			addEditorDeclarationPropertyDescriptor(object);

 			addTypePropertyDescriptor(object);

+			addIconPathPropertyDescriptor(object);

 		}

 		return itemPropertyDescriptors;

 	}

 

 	/**

-	 * This adds a property descriptor for the Editor Declaration feature.

+	 * This adds a property descriptor for the Type feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	protected void addEditorDeclarationPropertyDescriptor(Object object) {

+	protected void addTypePropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

 			(createItemPropertyDescriptor

 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

 				 getResourceLocator(),

-				 getString("_UI_TableEditorConfiguration_editorDeclaration_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_TableEditorConfiguration_editorDeclaration_feature", "_UI_TableEditorConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableconfigurationPackage.Literals.TABLE_EDITOR_CONFIGURATION__EDITOR_DECLARATION,

+				 getString("_UI_TableConfiguration_type_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_type_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__TYPE,

 				 true,

 				 false,

 				 false,

@@ -107,19 +98,19 @@ public class TableEditorConfigurationItemProvider
 	}

 

 	/**

-	 * This adds a property descriptor for the Type feature.

+	 * This adds a property descriptor for the Icon Path feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	protected void addTypePropertyDescriptor(Object object) {

+	protected void addIconPathPropertyDescriptor(Object object) {

 		itemPropertyDescriptors.add

 			(createItemPropertyDescriptor

 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

 				 getResourceLocator(),

-				 getString("_UI_TableEditorConfiguration_type_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_TableEditorConfiguration_type_feature", "_UI_TableEditorConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableconfigurationPackage.Literals.TABLE_EDITOR_CONFIGURATION__TYPE,

+				 getString("_UI_TableConfiguration_iconPath_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_TableConfiguration_iconPath_feature", "_UI_TableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__ICON_PATH,

 				 true,

 				 false,

 				 false,

@@ -140,8 +131,7 @@ public class TableEditorConfigurationItemProvider
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

 		if (childrenFeatures == null) {

 			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER);

-			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER);

+			childrenFeatures.add(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CREATION_TESTER);

 		}

 		return childrenFeatures;

 	}

@@ -160,14 +150,14 @@ public class TableEditorConfigurationItemProvider
 	}

 

 	/**

-	 * This returns TableEditorConfiguration.gif.

+	 * This returns TableConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	@Override

 	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableEditorConfiguration")); //$NON-NLS-1$

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableConfiguration")); //$NON-NLS-1$

 	}

 

 	/**

@@ -178,11 +168,10 @@ public class TableEditorConfigurationItemProvider
 	 */

 	@Override

 	public String getText(Object object) {

-		CellEditorDeclaration labelValue = ((TableEditorConfiguration)object).getEditorDeclaration();

-		String label = labelValue == null ? null : labelValue.toString();

+		String label = ((TableConfiguration)object).getName();

 		return label == null || label.length() == 0 ?

-			getString("_UI_TableEditorConfiguration_type") : //$NON-NLS-1$

-			getString("_UI_TableEditorConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_TableConfiguration_type") : //$NON-NLS-1$

+			getString("_UI_TableConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

@@ -196,13 +185,12 @@ public class TableEditorConfigurationItemProvider
 	public void notifyChanged(Notification notification) {

 		updateChildren(notification);

 

-		switch (notification.getFeatureID(TableEditorConfiguration.class)) {

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__EDITOR_DECLARATION:

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__TYPE:

+		switch (notification.getFeatureID(TableConfiguration.class)) {

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__TYPE:

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__ICON_PATH:

 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

 				return;

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER:

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER:

+			case NattableconfigurationPackage.TABLE_CONFIGURATION__CREATION_TESTER:

 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

 				return;

 		}

@@ -222,23 +210,8 @@ public class TableEditorConfigurationItemProvider
 

 		newChildDescriptors.add

 			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER,

-				 NattableaxisproviderFactory.eINSTANCE.createDefaultAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER,

-				 NattableaxisproviderFactory.eINSTANCE.createEMFFeatureValueAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER,

-				 NattableaxisproviderFactory.eINSTANCE.createDefaultAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableconfigurationPackage.Literals.TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER,

-				 NattableaxisproviderFactory.eINSTANCE.createEMFFeatureValueAxisProvider()));

+				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION__CREATION_TESTER,

+				 NattableconfigurationFactory.eINSTANCE.createJavaTableCreationTester()));

 	}

 

 	/**

@@ -253,8 +226,8 @@ public class TableEditorConfigurationItemProvider
 		Object childObject = child;

 

 		boolean qualify =

-			childFeature == NattableconfigurationPackage.Literals.TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER ||

-			childFeature == NattableconfigurationPackage.Literals.TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER;

+			childFeature == NattableconfigurationPackage.Literals.ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER ||

+			childFeature == NattableconfigurationPackage.Literals.ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER;

 

 		if (qualify) {

 			return getString

@@ -264,15 +237,4 @@ public class TableEditorConfigurationItemProvider
 		return super.getCreateChildText(owner, feature, child, selection);

 	}

 

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

 }

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
index 40f2da205ab..30d9a68147a 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
@@ -15,8 +15,10 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.
 

 import java.util.Collection;

 import java.util.List;

+

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

@@ -26,6 +28,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ViewerNotification;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

 

@@ -37,7 +40,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
  */

 public class FeatureLabelProviderConfigurationItemProvider

 	extends 

-EObjectLabelProviderConfigurationItemProvider

+ObjectLabelProviderConfigurationItemProvider

 	implements

 		IEditingDomainItemProvider,

 		IStructuredItemContentProvider,

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java
index b6efe02b7cc..1103dd929fd 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java
@@ -105,26 +105,26 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration} instances.

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	protected EObjectLabelProviderConfigurationItemProvider eObjectLabelProviderConfigurationItemProvider;

+	protected ObjectLabelProviderConfigurationItemProvider objectLabelProviderConfigurationItemProvider;

 

 	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration}.

+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	@Override

-	public Adapter createEObjectLabelProviderConfigurationAdapter() {

-		if (eObjectLabelProviderConfigurationItemProvider == null) {

-			eObjectLabelProviderConfigurationItemProvider = new EObjectLabelProviderConfigurationItemProvider(this);

+	public Adapter createObjectLabelProviderConfigurationAdapter() {

+		if (objectLabelProviderConfigurationItemProvider == null) {

+			objectLabelProviderConfigurationItemProvider = new ObjectLabelProviderConfigurationItemProvider(this);

 		}

 

-		return eObjectLabelProviderConfigurationItemProvider;

+		return objectLabelProviderConfigurationItemProvider;

 	}

 

 	/**

@@ -227,7 +227,7 @@ public class NattablelabelproviderItemProviderAdapterFactory extends Nattablelab
 	 */

 	public void dispose() {

 		if (featureLabelProviderConfigurationItemProvider != null) featureLabelProviderConfigurationItemProvider.dispose();

-		if (eObjectLabelProviderConfigurationItemProvider != null) eObjectLabelProviderConfigurationItemProvider.dispose();

+		if (objectLabelProviderConfigurationItemProvider != null) objectLabelProviderConfigurationItemProvider.dispose();

 	}

 

 }

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/EObjectLabelProviderConfigurationItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java
index a36c46b4266..313bb31fde5 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/EObjectLabelProviderConfigurationItemProvider.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java
@@ -33,18 +33,18 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ViewerNotification;

 

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration;

 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.provider.NattableEditPlugin;

 

 /**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration} object.

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration} object.

  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

  */

-public class EObjectLabelProviderConfigurationItemProvider

+public class ObjectLabelProviderConfigurationItemProvider

 	extends EModelElementItemProvider

 	implements

 		IEditingDomainItemProvider,

@@ -58,7 +58,7 @@ public class EObjectLabelProviderConfigurationItemProvider
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EObjectLabelProviderConfigurationItemProvider(AdapterFactory adapterFactory) {

+	public ObjectLabelProviderConfigurationItemProvider(AdapterFactory adapterFactory) {

 		super(adapterFactory);

 	}

 

@@ -113,9 +113,9 @@ public class EObjectLabelProviderConfigurationItemProvider
 			(createItemPropertyDescriptor

 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

 				 getResourceLocator(),

-				 getString("_UI_EObjectLabelProviderConfiguration_displayIcon_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_EObjectLabelProviderConfiguration_displayIcon_feature", "_UI_EObjectLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablelabelproviderPackage.Literals.EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON,

+				 getString("_UI_ObjectLabelProviderConfiguration_displayIcon_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_ObjectLabelProviderConfiguration_displayIcon_feature", "_UI_ObjectLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablelabelproviderPackage.Literals.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON,

 				 true,

 				 false,

 				 false,

@@ -135,9 +135,9 @@ public class EObjectLabelProviderConfigurationItemProvider
 			(createItemPropertyDescriptor

 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

 				 getResourceLocator(),

-				 getString("_UI_EObjectLabelProviderConfiguration_displayLabel_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_EObjectLabelProviderConfiguration_displayLabel_feature", "_UI_EObjectLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablelabelproviderPackage.Literals.EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL,

+				 getString("_UI_ObjectLabelProviderConfiguration_displayLabel_feature"), //$NON-NLS-1$

+				 getString("_UI_PropertyDescriptor_description", "_UI_ObjectLabelProviderConfiguration_displayLabel_feature", "_UI_ObjectLabelProviderConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+				 NattablelabelproviderPackage.Literals.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL,

 				 true,

 				 false,

 				 false,

@@ -147,14 +147,14 @@ public class EObjectLabelProviderConfigurationItemProvider
 	}

 

 	/**

-	 * This returns EObjectLabelProviderConfiguration.gif.

+	 * This returns ObjectLabelProviderConfiguration.gif.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	@Override

 	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectLabelProviderConfiguration")); //$NON-NLS-1$

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ObjectLabelProviderConfiguration")); //$NON-NLS-1$

 	}

 

 	/**

@@ -165,10 +165,10 @@ public class EObjectLabelProviderConfigurationItemProvider
 	 */

 	@Override

 	public String getText(Object object) {

-		String label = ((EObjectLabelProviderConfiguration)object).getLabelProviderContext();

+		String label = ((ObjectLabelProviderConfiguration)object).getLabelProviderContext();

 		return label == null || label.length() == 0 ?

-			getString("_UI_EObjectLabelProviderConfiguration_type") : //$NON-NLS-1$

-			getString("_UI_EObjectLabelProviderConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+			getString("_UI_ObjectLabelProviderConfiguration_type") : //$NON-NLS-1$

+			getString("_UI_ObjectLabelProviderConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

@@ -182,10 +182,10 @@ public class EObjectLabelProviderConfigurationItemProvider
 	public void notifyChanged(Notification notification) {

 		updateChildren(notification);

 

-		switch (notification.getFeatureID(EObjectLabelProviderConfiguration.class)) {

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

+		switch (notification.getFeatureID(ObjectLabelProviderConfiguration.class)) {

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

 				return;

 		}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
index 779e65bc0e3..910083ce1ee 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
@@ -105,49 +105,49 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis} instances.

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	protected EObjectAxisItemProvider eObjectAxisItemProvider;

+	protected IdAxisItemProvider idAxisItemProvider;

 

 	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis}.

+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	@Override

-	public Adapter createEObjectAxisAdapter() {

-		if (eObjectAxisItemProvider == null) {

-			eObjectAxisItemProvider = new EObjectAxisItemProvider(this);

+	public Adapter createIdAxisAdapter() {

+		if (idAxisItemProvider == null) {

+			idAxisItemProvider = new IdAxisItemProvider(this);

 		}

 

-		return eObjectAxisItemProvider;

+		return idAxisItemProvider;

 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis} instances.

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis} instances.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	protected IdAxisItemProvider idAxisItemProvider;

+	protected EObjectAxisItemProvider eObjectAxisItemProvider;

 

 	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis}.

+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

 	@Override

-	public Adapter createIdAxisAdapter() {

-		if (idAxisItemProvider == null) {

-			idAxisItemProvider = new IdAxisItemProvider(this);

+	public Adapter createEObjectAxisAdapter() {

+		if (eObjectAxisItemProvider == null) {

+			eObjectAxisItemProvider = new EObjectAxisItemProvider(this);

 		}

 

-		return idAxisItemProvider;

+		return eObjectAxisItemProvider;

 	}

 

 	/**

@@ -250,8 +250,8 @@ public class NattableItemProviderAdapterFactory extends NattableAdapterFactory i
 	 */

 	public void dispose() {

 		if (tableItemProvider != null) tableItemProvider.dispose();

-		if (eObjectAxisItemProvider != null) eObjectAxisItemProvider.dispose();

 		if (idAxisItemProvider != null) idAxisItemProvider.dispose();

+		if (eObjectAxisItemProvider != null) eObjectAxisItemProvider.dispose();

 	}

 

 }

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
index 60cf732aab1..b3c62bd37c9 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
@@ -15,11 +15,14 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.provider;
 

 import java.util.Collection;

 import java.util.List;

+

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.common.util.ResourceLocator;

+

 import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;

+

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

@@ -29,10 +32,14 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ViewerNotification;

+

 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.nattableaxisprovider.NattableaxisproviderFactory;

+

 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.provider.AbstractTableConfigurationItemProvider;

 

 /**

  * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.Table} object.

@@ -41,7 +48,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.N
  * @generated

  */

 public class TableItemProvider

-	extends EModelElementItemProvider

+	extends AbstractTableConfigurationItemProvider

 	implements

 		IEditingDomainItemProvider,

 		IStructuredItemContentProvider,

@@ -69,37 +76,13 @@ public class TableItemProvider
 		if (itemPropertyDescriptors == null) {

 			super.getPropertyDescriptors(object);

 

-			addNamePropertyDescriptor(object);

 			addContextPropertyDescriptor(object);

-			addDescriptionPropertyDescriptor(object);

 			addInvertAxisPropertyDescriptor(object);

 		}

 		return itemPropertyDescriptors;

 	}

 

 	/**

-	 * This adds a property descriptor for the Name feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addNamePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_Table_name_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_Table_name_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablePackage.Literals.TABLE__NAME,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

 	 * This adds a property descriptor for the Context feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -122,28 +105,6 @@ public class TableItemProvider
 	}

 

 	/**

-	 * This adds a property descriptor for the Description feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addDescriptionPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_Table_description_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_Table_description_feature", "_UI_Table_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablePackage.Literals.TABLE__DESCRIPTION,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

 	 * This adds a property descriptor for the Invert Axis feature.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -178,8 +139,6 @@ public class TableItemProvider
 		if (childrenFeatures == null) {

 			super.getChildrenFeatures(object);

 			childrenFeatures.add(NattablePackage.Literals.TABLE__EDITOR_CONFIGURATION);

-			childrenFeatures.add(NattablePackage.Literals.TABLE__VERTICAL_AXIS_PROVIDER);

-			childrenFeatures.add(NattablePackage.Literals.TABLE__HORIZONTAL_AXIS_PROVIDER);

 		}

 		return childrenFeatures;

 	}

@@ -234,14 +193,10 @@ public class TableItemProvider
 		updateChildren(notification);

 

 		switch (notification.getFeatureID(Table.class)) {

-			case NattablePackage.TABLE__NAME:

-			case NattablePackage.TABLE__DESCRIPTION:

 			case NattablePackage.TABLE__INVERT_AXIS:

 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

 				return;

 			case NattablePackage.TABLE__EDITOR_CONFIGURATION:

-			case NattablePackage.TABLE__VERTICAL_AXIS_PROVIDER:

-			case NattablePackage.TABLE__HORIZONTAL_AXIS_PROVIDER:

 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

 				return;

 		}

@@ -262,27 +217,7 @@ public class TableItemProvider
 		newChildDescriptors.add

 			(createChildParameter

 				(NattablePackage.Literals.TABLE__EDITOR_CONFIGURATION,

-				 NattableconfigurationFactory.eINSTANCE.createTableEditorConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablePackage.Literals.TABLE__VERTICAL_AXIS_PROVIDER,

-				 NattableaxisproviderFactory.eINSTANCE.createDefaultAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablePackage.Literals.TABLE__VERTICAL_AXIS_PROVIDER,

-				 NattableaxisproviderFactory.eINSTANCE.createEMFFeatureValueAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablePackage.Literals.TABLE__HORIZONTAL_AXIS_PROVIDER,

-				 NattableaxisproviderFactory.eINSTANCE.createDefaultAxisProvider()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablePackage.Literals.TABLE__HORIZONTAL_AXIS_PROVIDER,

-				 NattableaxisproviderFactory.eINSTANCE.createEMFFeatureValueAxisProvider()));

+				 NattableconfigurationFactory.eINSTANCE.createTableConfiguration()));

 	}

 

 	/**

@@ -297,8 +232,8 @@ public class TableItemProvider
 		Object childObject = child;

 

 		boolean qualify =

-			childFeature == NattablePackage.Literals.TABLE__VERTICAL_AXIS_PROVIDER ||

-			childFeature == NattablePackage.Literals.TABLE__HORIZONTAL_AXIS_PROVIDER;

+			childFeature == NattableconfigurationPackage.Literals.ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER ||

+			childFeature == NattableconfigurationPackage.Literals.ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER;

 

 		if (qualify) {

 			return getString

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
index fb1f3cbe0c8..55b8364166a 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Export-Package: org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisco
  org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation,

  org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation,

  org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation,

- org.eclipse.papyrus.infra.nattable.model.nattable.nattablecontentprovider.presentation,

  org.eclipse.papyrus.infra.nattable.model.nattable.presentation

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.core.resources;visibility:=reexport,

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
index 91a72d93bfa..bc4cd259bc3 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
@@ -84,6 +84,14 @@ null
 null

 null

 null

+null

+null

+null

+null

+null

+null

+null

+null

    <extension point="org.eclipse.ui.editors">

       <!-- @generated nattable -->

       <editor

@@ -129,6 +137,14 @@ null
 null

 null

 null

+null

+null

+null

+null

+null

+null

+null

+null

    <extension point="org.eclipse.ui.editors">

       <!-- @generated nattable -->

       <editor

@@ -175,6 +191,14 @@ null
 null

 null

 null

+null

+null

+null

+null

+null

+null

+null

+null

    <extension point="org.eclipse.ui.editors">

       <!-- @generated nattable -->

       <editor

@@ -221,4 +245,12 @@ null
 null

 null

 null

+null

+null

+null

+null

+null

+null

+null

+null

 </plugin>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
index 1781e9000e0..d15c06dd55c 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
@@ -169,6 +169,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.pr
 import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

 

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

 

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
index 176abc8d710..fb7e258b200 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.
 

 import java.io.IOException;

 import java.io.InputStream;

+

 import java.util.ArrayList;

 import java.util.Collection;

 import java.util.Collections;

@@ -24,6 +25,7 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;

 import java.util.List;

 import java.util.Map;

+

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IMarker;

 import org.eclipse.core.resources.IResource;

@@ -32,19 +34,24 @@ import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;

 import org.eclipse.core.resources.IResourceDeltaVisitor;

 import org.eclipse.core.resources.ResourcesPlugin;

+

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IPath;

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.NullProgressMonitor;

+

 import org.eclipse.jface.action.IMenuListener;

 import org.eclipse.jface.action.IMenuManager;

 import org.eclipse.jface.action.IStatusLineManager;

 import org.eclipse.jface.action.IToolBarManager;

 import org.eclipse.jface.action.MenuManager;

 import org.eclipse.jface.action.Separator;

+

 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.dialogs.ProgressMonitorDialog;

+

 import org.eclipse.jface.util.LocalSelectionTransfer;

+

 import org.eclipse.jface.viewers.ColumnWeightData;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

@@ -58,21 +65,29 @@ import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.TableViewer;

 import org.eclipse.jface.viewers.TreeViewer;

 import org.eclipse.jface.viewers.Viewer;

+

 import org.eclipse.swt.SWT;

+

 import org.eclipse.swt.custom.CTabFolder;

+

 import org.eclipse.swt.dnd.DND;

 import org.eclipse.swt.dnd.FileTransfer;

 import org.eclipse.swt.dnd.Transfer;

+

 import org.eclipse.swt.events.ControlAdapter;

 import org.eclipse.swt.events.ControlEvent;

+

 import org.eclipse.swt.graphics.Point;

+

 import org.eclipse.swt.layout.FillLayout;

+

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Menu;

 import org.eclipse.swt.widgets.Table;

 import org.eclipse.swt.widgets.TableColumn;

 import org.eclipse.swt.widgets.Tree;

 import org.eclipse.swt.widgets.TreeColumn;

+

 import org.eclipse.ui.IActionBars;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

@@ -80,26 +95,37 @@ import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IPartListener;

 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.PartInitException;

+

 import org.eclipse.ui.dialogs.SaveAsDialog;

+

 import org.eclipse.ui.ide.IGotoMarker;

+

 import org.eclipse.ui.part.FileEditorInput;

 import org.eclipse.ui.part.MultiPageEditorPart;

+

 import org.eclipse.ui.views.contentoutline.ContentOutline;

 import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

+

 import org.eclipse.ui.views.properties.IPropertySheetPage;

 import org.eclipse.ui.views.properties.PropertySheet;

 import org.eclipse.ui.views.properties.PropertySheetPage;

+

 import org.eclipse.emf.common.command.BasicCommandStack;

 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.common.command.CommandStack;

 import org.eclipse.emf.common.command.CommandStackListener;

+

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.common.ui.MarkerHelper;

 import org.eclipse.emf.common.ui.ViewerPane;

+

 import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

+

 import org.eclipse.emf.common.ui.viewer.IViewerProvider;

+

 import org.eclipse.emf.common.util.BasicDiagnostic;

 import org.eclipse.emf.common.util.Diagnostic;

 import org.eclipse.emf.common.util.URI;

@@ -107,33 +133,51 @@ import org.eclipse.emf.common.util.URI;
 

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.resource.ResourceSet;

+

 import org.eclipse.emf.ecore.util.EContentAdapter;

 import org.eclipse.emf.ecore.util.EcoreUtil;

+

 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.emf.edit.domain.IEditingDomainProvider;

+

 import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

 import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

+

 import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

+

 import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

+

 import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

+

 import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

 import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

 import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

+

 import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

 import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

+

 import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

 import org.eclipse.emf.edit.ui.util.EditUIUtil;

+

 import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

+

 import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

+

 import org.eclipse.ui.actions.WorkspaceModifyOperation;

 

 

@@ -380,7 +424,7 @@ public class NattableconfigurationEditor
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	protected EContentAdapter problemIndicationAdapter = 

+	protected EContentAdapter problemIndicationAdapter =

 		new EContentAdapter() {

 			@Override

 			public void notifyChanged(Notification notification) {

@@ -584,7 +628,7 @@ public class NattableconfigurationEditor
 			updateProblemIndication();

 		}

 	}

-  

+

 	/**

 	 * Updates the problems indication with the information described in the specified diagnostic.

 	 * <!-- begin-user-doc -->

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecontentprovider/presentation/NattablecontentproviderActionBarContributor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecontentprovider/presentation/NattablecontentproviderActionBarContributor.java
deleted file mode 100644
index c3105c4ecd8..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecontentprovider/presentation/NattablecontentproviderActionBarContributor.java
+++ /dev/null
@@ -1,437 +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.nattablecontentprovider.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Nattablecontentprovider model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablecontentproviderActionBarContributor

-	extends EditingDomainActionBarContributor

-	implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-		new Action(NattableEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$

-				}

-				catch (PartInitException exception) {

-					NattableEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-		new Action(NattableEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$

-		{

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattablecontentproviderActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("nattablecontentprovider-settings")); //$NON-NLS-1$

-		toolBarManager.add(new Separator("nattablecontentprovider-additions")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_NattablecontentproviderEditor_menu"), "org.eclipse.papyrus.infra.nattable.model.nattable.nattablecontentproviderMenuID"); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$

-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$

-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$

-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-		

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-

-		submenuManager = new MenuManager(NattableEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
index db2a428f728..4adfc70df22 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
@@ -169,6 +169,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.p
 import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

 

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

 

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
index a1cf92e60f0..a57bf674efe 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.presentation;
 

 import java.io.IOException;

 import java.io.InputStream;

+

 import java.util.ArrayList;

 import java.util.Collection;

 import java.util.Collections;

@@ -24,6 +25,7 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;

 import java.util.List;

 import java.util.Map;

+

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IMarker;

 import org.eclipse.core.resources.IResource;

@@ -32,19 +34,24 @@ import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;

 import org.eclipse.core.resources.IResourceDeltaVisitor;

 import org.eclipse.core.resources.ResourcesPlugin;

+

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IPath;

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.NullProgressMonitor;

+

 import org.eclipse.jface.action.IMenuListener;

 import org.eclipse.jface.action.IMenuManager;

 import org.eclipse.jface.action.IStatusLineManager;

 import org.eclipse.jface.action.IToolBarManager;

 import org.eclipse.jface.action.MenuManager;

 import org.eclipse.jface.action.Separator;

+

 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.dialogs.ProgressMonitorDialog;

+

 import org.eclipse.jface.util.LocalSelectionTransfer;

+

 import org.eclipse.jface.viewers.ColumnWeightData;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.ISelectionChangedListener;

@@ -58,21 +65,29 @@ import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.TableViewer;

 import org.eclipse.jface.viewers.TreeViewer;

 import org.eclipse.jface.viewers.Viewer;

+

 import org.eclipse.swt.SWT;

+

 import org.eclipse.swt.custom.CTabFolder;

+

 import org.eclipse.swt.dnd.DND;

 import org.eclipse.swt.dnd.FileTransfer;

 import org.eclipse.swt.dnd.Transfer;

+

 import org.eclipse.swt.events.ControlAdapter;

 import org.eclipse.swt.events.ControlEvent;

+

 import org.eclipse.swt.graphics.Point;

+

 import org.eclipse.swt.layout.FillLayout;

+

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Menu;

 import org.eclipse.swt.widgets.Table;

 import org.eclipse.swt.widgets.TableColumn;

 import org.eclipse.swt.widgets.Tree;

 import org.eclipse.swt.widgets.TreeColumn;

+

 import org.eclipse.ui.IActionBars;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

@@ -80,26 +95,37 @@ import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IPartListener;

 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.PartInitException;

+

 import org.eclipse.ui.dialogs.SaveAsDialog;

+

 import org.eclipse.ui.ide.IGotoMarker;

+

 import org.eclipse.ui.part.FileEditorInput;

 import org.eclipse.ui.part.MultiPageEditorPart;

+

 import org.eclipse.ui.views.contentoutline.ContentOutline;

 import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

+

 import org.eclipse.ui.views.properties.IPropertySheetPage;

 import org.eclipse.ui.views.properties.PropertySheet;

 import org.eclipse.ui.views.properties.PropertySheetPage;

+

 import org.eclipse.emf.common.command.BasicCommandStack;

 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.common.command.CommandStack;

 import org.eclipse.emf.common.command.CommandStackListener;

+

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

+

 import org.eclipse.emf.common.ui.MarkerHelper;

 import org.eclipse.emf.common.ui.ViewerPane;

+

 import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

+

 import org.eclipse.emf.common.ui.viewer.IViewerProvider;

+

 import org.eclipse.emf.common.util.BasicDiagnostic;

 import org.eclipse.emf.common.util.Diagnostic;

 import org.eclipse.emf.common.util.URI;

@@ -107,32 +133,49 @@ import org.eclipse.emf.common.util.URI;
 

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.resource.ResourceSet;

+

 import org.eclipse.emf.ecore.util.EContentAdapter;

 import org.eclipse.emf.ecore.util.EcoreUtil;

+

 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.emf.edit.domain.IEditingDomainProvider;

+

 import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

 import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

+

 import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

+

 import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

+

 import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

+

 import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

 import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

 import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

+

 import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

 import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

+

 import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

 import org.eclipse.emf.edit.ui.util.EditUIUtil;

+

 import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

+

 import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

+

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

+

 import org.eclipse.ui.actions.WorkspaceModifyOperation;

 

 

@@ -379,7 +422,7 @@ public class NattableEditor
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	protected EContentAdapter problemIndicationAdapter = 

+	protected EContentAdapter problemIndicationAdapter =

 		new EContentAdapter() {

 			@Override

 			public void notifyChanged(Notification notification) {

@@ -583,7 +626,7 @@ public class NattableEditor
 			updateProblemIndication();

 		}

 	}

-  

+

 	/**

 	 * Updates the problems indication with the information described in the specified diagnostic.

 	 * <!-- begin-user-doc -->

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.core.resources.prefs b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..5c09a544840
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+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/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecore b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecore
new file mode 100644
index 00000000000..594f3e95d82
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecore
@@ -0,0 +1,43 @@
+<?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/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecorediag b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecorediag
new file mode 100644
index 00000000000..621d431e91f
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/DefaultName.ecorediag
@@ -0,0 +1,350 @@
+<?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/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
index 2756af456bd..308f7a16b16 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
@@ -2,24 +2,14 @@
 <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="../../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"

-        iD="true"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Table" eSuperTypes="#//nattableconfiguration/AbstractTableConfiguration">

     <eStructuralFeatures xsi:type="ecore:EReference" name="context" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="editorConfiguration" lowerBound="1"

-        eType="#//nattableconfiguration/TableEditorConfiguration"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="verticalAxisProvider" lowerBound="1"

-        eType="#//nattableaxisprovider/AbstractAxisProvider" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="horizontalAxisProvider"

-        lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider" containment="true"/>

+        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"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="EObjectAxis" eSuperTypes="#//IAxis">

-    <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="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"/>

@@ -28,24 +18,11 @@
     <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="#//IAxis">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

+  </eClassifiers>

   <eSubpackages name="nattableconfiguration" nsURI="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"

       nsPrefix="nattableconfiguration">

-    <eClassifiers xsi:type="ecore:EClass" name="TableEditorConfiguration" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="verticalAxisProvider"

-          lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider" containment="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="horizontalAxisProvider"

-          lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider" containment="true"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="editorDeclaration" lowerBound="1"

-          eType="#//nattableconfiguration/CellEditorDeclaration" defaultValueLiteral="COLUMN"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"

-          iD="true"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EEnum" name="CellEditorDeclaration">

-      <eLiterals name="COLUMN"/>

-      <eLiterals name="ROW" value="1"/>

-      <eLiterals name="CELL" value="2"/>

-    </eClassifiers>

     <eClassifiers xsi:type="ecore:EClass" name="AbstractTableConfiguration" abstract="true"

         eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">

       <eStructuralFeatures xsi:type="ecore:EReference" name="rowAxisProvider" lowerBound="1"

@@ -54,10 +31,28 @@
           eType="#//nattableaxisprovider/AbstractAxisProvider" containment="true"/>

       <eStructuralFeatures xsi:type="ecore:EAttribute" name="editorDeclaration" lowerBound="1"

           eType="#//nattableconfiguration/CellEditorDeclaration" defaultValueLiteral="COLUMN"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"

-          iD="true"/>

+      <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/AbstractTableConfiguration">

+      <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="#//nattableconfiguration/AbstractTableCreationTester"

+          containment="true"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EEnum" name="CellEditorDeclaration">

+      <eLiterals name="COLUMN"/>

+      <eLiterals name="ROW" value="1"/>

+      <eLiterals name="CELL" value="2"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="AbstractTableCreationTester" abstract="true">

+      <eOperations name="getTester" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="JavaTableCreationTester" eSuperTypes="#//nattableconfiguration/AbstractTableCreationTester">

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="tester" lowerBound="1"

+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    </eClassifiers>

   </eSubpackages>

   <eSubpackages name="nattableaxisprovider" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider"

       nsPrefix="nattableaxisprovider">

@@ -90,7 +85,7 @@
           eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

     </eClassifiers>

     <eClassifiers xsi:type="ecore:EClass" name="FeatureLabelProviderConfiguration"

-        eSuperTypes="#//nattablelabelprovider/EObjectLabelProviderConfiguration">

+        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"/>

@@ -104,7 +99,7 @@
           eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"

           defaultValueLiteral="true"/>

     </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="EObjectLabelProviderConfiguration"

+    <eClassifiers xsi:type="ecore:EClass" name="ObjectLabelProviderConfiguration"

         eSuperTypes="#//nattablelabelprovider/ILabelConfiguration">

       <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayIcon" lowerBound="1"

           eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"

@@ -123,15 +118,15 @@
     <eClassifiers xsi:type="ecore:EClass" name="DefaultAxisConfiguration" eSuperTypes="#//nattableaxisconfiguration/AbstractAxisConfiguration">

       <eStructuralFeatures xsi:type="ecore:EAttribute" name="indexStyle" lowerBound="1"

           eType="#//nattableaxisconfiguration/AxisIndexStyle"/>

-      <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: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:EEnum" name="AxisIndexStyle">

       <eLiterals name="NUMERIC" literal="NUMERIC"/>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
new file mode 100644
index 00000000000..ab1d3a4e7a6
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
@@ -0,0 +1,521 @@
+<?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="1375" y="835" 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>

+      <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="935" y="520"/>

+  </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="925" y="725"/>

+  </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="1080" y="725" 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="_b8ICQJewEeKr0Yypv4rfLA" type="2001">

+        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/AbstractTableConfiguration/editorDeclaration"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_b8ICQZewEeKr0Yypv4rfLA"/>

+      </children>

+      <children xmi:type="notation:Node" xmi:id="_b8ICQpewEeKr0Yypv4rfLA" type="2001">

+        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableconfiguration/AbstractTableConfiguration/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/AbstractTableConfiguration/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/AbstractTableConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b7-RQpewEeKr0Yypv4rfLA" x="1330" y="170"/>

+  </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>

+      <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="1515" y="525"/>

+  </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="_huH2EJewEeKr0Yypv4rfLA" type="1001">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_huaxAJewEeKr0Yypv4rfLA" source="Shortcut">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_huaxAZewEeKr0Yypv4rfLA" key="modelID" value="EcoreTools"/>

+    </eAnnotations>

+    <children xmi:type="notation:Node" xmi:id="_huH2E5ewEeKr0Yypv4rfLA" type="4001"/>

+    <children xmi:type="notation:Node" xmi:id="_huH2FJewEeKr0Yypv4rfLA" type="5001">

+      <styles xmi:type="notation:DrawerStyle" xmi:id="_huH2FZewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_huH2FpewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_huH2F5ewEeKr0Yypv4rfLA"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_huH2GJewEeKr0Yypv4rfLA" type="5002">

+      <styles xmi:type="notation:DrawerStyle" xmi:id="_huH2GZewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_huH2GpewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_huH2G5ewEeKr0Yypv4rfLA"/>

+    </children>

+    <styles xmi:type="notation:ShapeStyle" xmi:id="_huH2EZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/AbstractTableCreationTester"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_huH2EpewEeKr0Yypv4rfLA" x="1785" y="530" width="213"/>

+  </children>

+  <children xmi:type="notation:Node" xmi:id="_iCWZoJewEeKr0Yypv4rfLA" type="1001">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iCpUkJewEeKr0Yypv4rfLA" source="Shortcut">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iCpUkZewEeKr0Yypv4rfLA" key="modelID" value="EcoreTools"/>

+    </eAnnotations>

+    <children xmi:type="notation:Node" xmi:id="_iCWZo5ewEeKr0Yypv4rfLA" type="4001"/>

+    <children xmi:type="notation:Node" xmi:id="_iCWZpJewEeKr0Yypv4rfLA" type="5001">

+      <styles xmi:type="notation:DrawerStyle" xmi:id="_iCWZpZewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_iCWZppewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iCWZp5ewEeKr0Yypv4rfLA"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_iCgKoJewEeKr0Yypv4rfLA" type="5002">

+      <styles xmi:type="notation:DrawerStyle" xmi:id="_iCgKoZewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_iCgKopewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iCgKo5ewEeKr0Yypv4rfLA"/>

+    </children>

+    <styles xmi:type="notation:ShapeStyle" xmi:id="_iCWZoZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableconfiguration/JavaTableCreationTester"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iCWZopewEeKr0Yypv4rfLA" x="1820" y="795"/>

+  </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">

+      <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="590" y="185"/>

+  </children>

+  <children xmi:type="notation:Node" xmi:id="_iqOR8JewEeKr0Yypv4rfLA" type="1001">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iqYC8JewEeKr0Yypv4rfLA" source="Shortcut">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iqYC8ZewEeKr0Yypv4rfLA" key="modelID" value="EcoreTools"/>

+    </eAnnotations>

+    <children xmi:type="notation:Node" xmi:id="_iqOR85ewEeKr0Yypv4rfLA" type="4001"/>

+    <children xmi:type="notation:Node" xmi:id="_iqOR9JewEeKr0Yypv4rfLA" type="5001">

+      <styles xmi:type="notation:DrawerStyle" xmi:id="_iqOR9ZewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_iqOR9pewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iqOR95ewEeKr0Yypv4rfLA"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_iqOR-JewEeKr0Yypv4rfLA" type="5002">

+      <styles xmi:type="notation:DrawerStyle" xmi:id="_iqOR-ZewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_iqOR-pewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_iqOR-5ewEeKr0Yypv4rfLA"/>

+    </children>

+    <styles xmi:type="notation:ShapeStyle" xmi:id="_iqOR8ZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisprovider/DefaultAxisProvider"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iqOR8pewEeKr0Yypv4rfLA" x="595" y="515"/>

+  </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="610" y="820" width="198" 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/ILabelConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jpJ_YpewEeKr0Yypv4rfLA" x="50" y="370"/>

+  </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="45" y="650"/>

+  </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="51" y="500"/>

+  </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">

+      <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="70" y="205" width="438"/>

+  </children>

+  <children xmi:type="notation:Node" xmi:id="_k0bfsJewEeKr0Yypv4rfLA" type="1001">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_k0vBsJewEeKr0Yypv4rfLA" source="Shortcut">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_k0vBsZewEeKr0Yypv4rfLA" key="modelID" value="EcoreTools"/>

+    </eAnnotations>

+    <children xmi:type="notation:Node" xmi:id="_k0bfs5ewEeKr0Yypv4rfLA" type="4001"/>

+    <children xmi:type="notation:Node" xmi:id="_k0bftJewEeKr0Yypv4rfLA" type="5001">

+      <children xmi:type="notation:Node" xmi:id="_k0bfvJewEeKr0Yypv4rfLA" type="2001">

+        <element xmi:type="ecore:EAttribute" href="nattable.ecore#//nattableaxisconfiguration/DefaultAxisConfiguration/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/DefaultAxisConfiguration/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/DefaultAxisConfiguration/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/DefaultAxisConfiguration/displayIndex"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_k0bfv5ewEeKr0Yypv4rfLA"/>

+      </children>

+      <styles xmi:type="notation:DrawerStyle" xmi:id="_k0bftZewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_k0bftpewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_k0bft5ewEeKr0Yypv4rfLA"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_k0bfuJewEeKr0Yypv4rfLA" type="5002">

+      <styles xmi:type="notation:DrawerStyle" xmi:id="_k0bfuZewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_k0bfupewEeKr0Yypv4rfLA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_k0bfu5ewEeKr0Yypv4rfLA"/>

+    </children>

+    <styles xmi:type="notation:ShapeStyle" xmi:id="_k0bfsZewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

+    <element xmi:type="ecore:EClass" href="nattable.ecore#//nattableaxisconfiguration/DefaultAxisConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_k0bfspewEeKr0Yypv4rfLA" x="345" y="335"/>

+  </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>

+  <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]"/>

+  </edges>

+  <edges xmi:type="notation:Edge" xmi:id="_X9uTDJewEeKr0Yypv4rfLA" type="3003" source="_X9uTAJewEeKr0Yypv4rfLA" target="_XW48gJewEeKr0Yypv4rfLA">

+    <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="_Zf6egJewEeKr0Yypv4rfLA" id="(0.9408602150537635,0.8823529411764706)"/>

+  </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="[-81, -103, 70, 91]$[-150, -193, 1, 1]"/>

+  </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.37349397590361444,0.0)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QOdEwJexEeKr0Yypv4rfLA" id="(0.943609022556391,0.9803921568627451)"/>

+  </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/editorConfiguration"/>

+    <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.9698275862068966,0.019230769230769232)"/>

+  </edges>

+  <edges xmi:type="notation:Edge" xmi:id="_huRAAJewEeKr0Yypv4rfLA" type="3002" source="_dKFDIJewEeKr0Yypv4rfLA" target="_huH2EJewEeKr0Yypv4rfLA">

+    <children xmi:type="notation:Node" xmi:id="_huRABJewEeKr0Yypv4rfLA" type="4011">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_huRABZewEeKr0Yypv4rfLA" x="-10" y="-10"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_huRABpewEeKr0Yypv4rfLA" type="4012">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_huRAB5ewEeKr0Yypv4rfLA" x="10" y="10"/>

+    </children>

+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_huRAAZewEeKr0Yypv4rfLA" lineColor="4210752"/>

+    <styles xmi:type="notation:FontStyle" xmi:id="_huRAApewEeKr0Yypv4rfLA" 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="_huRAA5ewEeKr0Yypv4rfLA" points="[-46, -41, 502, 461]$[-547, -501, 1, 1]"/>

+  </edges>

+  <edges xmi:type="notation:Edge" xmi:id="_iCgKppewEeKr0Yypv4rfLA" type="3003" source="_iCWZoJewEeKr0Yypv4rfLA" target="_huH2EJewEeKr0Yypv4rfLA">

+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_iCgKp5ewEeKr0Yypv4rfLA" routing="Rectilinear" lineColor="4210752"/>

+    <styles xmi:type="notation:FontStyle" xmi:id="_iCgKqJewEeKr0Yypv4rfLA" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iCgKqZewEeKr0Yypv4rfLA" points="[1, 0, -947, -412]$[872, 379, -76, -33]"/>

+  </edges>

+  <edges xmi:type="notation:Edge" xmi:id="_iby0YJewEeKr0Yypv4rfLA" type="3002" source="_b7-RQJewEeKr0Yypv4rfLA" target="_ibpDYJewEeKr0Yypv4rfLA">

+    <children xmi:type="notation:Node" xmi:id="_iby0ZJewEeKr0Yypv4rfLA" type="4011">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iby0ZZewEeKr0Yypv4rfLA" x="-10" y="-10"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_iby0ZpewEeKr0Yypv4rfLA" type="4012">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iby0Z5ewEeKr0Yypv4rfLA" x="10" y="10"/>

+    </children>

+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_iby0YZewEeKr0Yypv4rfLA" lineColor="4210752"/>

+    <styles xmi:type="notation:FontStyle" xmi:id="_iby0YpewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/AbstractTableConfiguration/rowAxisProvider"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iby0Y5ewEeKr0Yypv4rfLA" points="[-132, -7, 561, 0]$[-666, -7, 27, 0]"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_21a_8JewEeKr0Yypv4rfLA" id="(0.8701923076923077,0.3118279569892473)"/>

+  </edges>

+  <edges xmi:type="notation:Edge" xmi:id="_iby0aJewEeKr0Yypv4rfLA" type="3002" source="_b7-RQJewEeKr0Yypv4rfLA" target="_ibpDYJewEeKr0Yypv4rfLA">

+    <children xmi:type="notation:Node" xmi:id="_iby0bJewEeKr0Yypv4rfLA" type="4011">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iby0bZewEeKr0Yypv4rfLA" x="-10" y="-10"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_iby0bpewEeKr0Yypv4rfLA" type="4012">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iby0b5ewEeKr0Yypv4rfLA" x="10" y="10"/>

+    </children>

+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_iby0aZewEeKr0Yypv4rfLA" lineColor="4210752"/>

+    <styles xmi:type="notation:FontStyle" xmi:id="_iby0apewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/AbstractTableConfiguration/columnAxisProvider"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iby0a5ewEeKr0Yypv4rfLA" points="[-132, -41, 166, 50]$[-297, -91, 1, 0]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f8gSAJexEeKr0Yypv4rfLA" id="(0.018796992481203006,0.7254901960784313)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fkjsEJexEeKr0Yypv4rfLA" id="(0.9663461538461539,0.6881720430107527)"/>

+  </edges>

+  <edges xmi:type="notation:Edge" xmi:id="_iqOR_JewEeKr0Yypv4rfLA" type="3002" source="_iqOR8JewEeKr0Yypv4rfLA" target="_XW48gJewEeKr0Yypv4rfLA">

+    <children xmi:type="notation:Node" xmi:id="_iqOSAJewEeKr0Yypv4rfLA" type="4011">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iqOSAZewEeKr0Yypv4rfLA" x="-10" y="-10"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_iqOSApewEeKr0Yypv4rfLA" type="4012">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_iqOSA5ewEeKr0Yypv4rfLA" x="10" y="10"/>

+    </children>

+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_iqOR_ZewEeKr0Yypv4rfLA" lineColor="4210752"/>

+    <styles xmi:type="notation:FontStyle" xmi:id="_iqOR_pewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/DefaultAxisProvider/axis"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iqOR_5ewEeKr0Yypv4rfLA" points="[80, 6, -313, -24]$[301, 23, -92, -7]"/>

+  </edges>

+  <edges xmi:type="notation:Edge" xmi:id="_iqOSBJewEeKr0Yypv4rfLA" type="3003" source="_iqOR8JewEeKr0Yypv4rfLA" target="_ibpDYJewEeKr0Yypv4rfLA">

+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_iqOSBZewEeKr0Yypv4rfLA" routing="Rectilinear" lineColor="4210752"/>

+    <styles xmi:type="notation:FontStyle" xmi:id="_iqOSBpewEeKr0Yypv4rfLA" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iqOSB5ewEeKr0Yypv4rfLA" points="[-14, -29, -33, 285]$[-14, -268, -33, 46]"/>

+  </edges>

+  <edges xmi:type="notation:Edge" xmi:id="_i5jHYJewEeKr0Yypv4rfLA" type="3003" source="_i5ZWYJewEeKr0Yypv4rfLA" target="_iqOR8JewEeKr0Yypv4rfLA">

+    <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="[1, 1, -503, -635]$[481, 607, -23, -29]"/>

+  </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="_kk9gUJewEeKr0Yypv4rfLA" target="_jpJ_YJewEeKr0Yypv4rfLA">

+    <children xmi:type="notation:Node" xmi:id="_klHRVJewEeKr0Yypv4rfLA" type="4011">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_klHRVZewEeKr0Yypv4rfLA" x="-36" y="17"/>

+    </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#//nattableaxisconfiguration/AbstractAxisConfiguration/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.16666666666666666,0.9)"/>

+  </edges>

+  <edges xmi:type="notation:Edge" xmi:id="_klHRWJewEeKr0Yypv4rfLA" type="3002" source="_ibpDYJewEeKr0Yypv4rfLA" target="_kk9gUJewEeKr0Yypv4rfLA">

+    <children xmi:type="notation:Node" xmi:id="_klHRXJewEeKr0Yypv4rfLA" type="4011">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_klHRXZewEeKr0Yypv4rfLA" x="-10" y="-10"/>

+    </children>

+    <children xmi:type="notation:Node" xmi:id="_klHRXpewEeKr0Yypv4rfLA" type="4012">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_klHRX5ewEeKr0Yypv4rfLA" x="10" y="10"/>

+    </children>

+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_klHRWZewEeKr0Yypv4rfLA" lineColor="4210752"/>

+    <styles xmi:type="notation:FontStyle" xmi:id="_klHRWpewEeKr0Yypv4rfLA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

+    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableaxisprovider/AbstractAxisProvider/axisConfiguration"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_klHRW5ewEeKr0Yypv4rfLA" points="[-40, -45, 553, 635]$[-592, -679, 1, 1]"/>

+  </edges>

+  <edges xmi:type="notation:Edge" xmi:id="_k0lQsJewEeKr0Yypv4rfLA" type="3003" source="_k0bfsJewEeKr0Yypv4rfLA" target="_kk9gUJewEeKr0Yypv4rfLA">

+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_k0lQsZewEeKr0Yypv4rfLA" routing="Rectilinear" lineColor="4210752"/>

+    <styles xmi:type="notation:FontStyle" xmi:id="_k0lQspewEeKr0Yypv4rfLA" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_k0lQs5ewEeKr0Yypv4rfLA" points="[0, 1, -179, -706]$[171, 678, -8, -29]"/>

+  </edges>

+</notation:Diagram>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
index cc6564defa7..1b25b167819 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
@@ -41,22 +41,22 @@ public interface NattableFactory extends EFactory {
 	Table createTable();

 

 	/**

-	 * Returns a new object of class '<em>EObject Axis</em>'.

+	 * Returns a new object of class '<em>Id Axis</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>EObject Axis</em>'.

+	 * @return a new object of class '<em>Id Axis</em>'.

 	 * @generated

 	 */

-	EObjectAxis createEObjectAxis();

+	IdAxis createIdAxis();

 

 	/**

-	 * Returns a new object of class '<em>Id Axis</em>'.

+	 * Returns a new object of class '<em>EObject Axis</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Id Axis</em>'.

+	 * @return a new object of class '<em>EObject Axis</em>'.

 	 * @generated

 	 */

-	IdAxis createIdAxis();

+	EObjectAxis createEObjectAxis();

 

 	/**

 	 * Returns the package supported by this factory.

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
index 3231b9cc91d..f9493aac7fe 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
@@ -19,6 +19,8 @@ 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.

@@ -85,61 +87,70 @@ public interface NattablePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int TABLE__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

+	int TABLE__EANNOTATIONS = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__EANNOTATIONS;

 

 	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * The feature id for the '<em><b>Row Axis Provider</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int TABLE__NAME = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;

+	int TABLE__ROW_AXIS_PROVIDER = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER;

 

 	/**

-	 * The feature id for the '<em><b>Context</b></em>' reference.

+	 * The feature id for the '<em><b>Column Axis Provider</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int TABLE__CONTEXT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;

+	int TABLE__COLUMN_AXIS_PROVIDER = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER;

 

 	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

+	 * The feature id for the '<em><b>Editor Declaration</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int TABLE__DESCRIPTION = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;

+	int TABLE__EDITOR_DECLARATION = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION;

 

 	/**

-	 * The feature id for the '<em><b>Editor Configuration</b></em>' reference.

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int TABLE__EDITOR_CONFIGURATION = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;

+	int TABLE__NAME = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__NAME;

 

 	/**

-	 * The feature id for the '<em><b>Vertical Axis Provider</b></em>' containment reference.

+	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int TABLE__VERTICAL_AXIS_PROVIDER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 4;

+	int TABLE__DESCRIPTION = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION;

 

 	/**

-	 * The feature id for the '<em><b>Horizontal Axis Provider</b></em>' containment reference.

+	 * The feature id for the '<em><b>Context</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int TABLE__HORIZONTAL_AXIS_PROVIDER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 5;

+	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.

@@ -148,7 +159,7 @@ public interface NattablePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int TABLE__INVERT_AXIS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 6;

+	int TABLE__INVERT_AXIS = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION_FEATURE_COUNT + 2;

 

 	/**

 	 * The number of structural features of the '<em>Table</em>' class.

@@ -157,7 +168,7 @@ public interface NattablePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int TABLE_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 7;

+	int TABLE_FEATURE_COUNT = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION_FEATURE_COUNT + 3;

 

 	/**

 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

@@ -166,7 +177,7 @@ public interface NattablePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int TABLE___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

+	int TABLE___GET_EANNOTATION__STRING = NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION___GET_EANNOTATION__STRING;

 

 	/**

 	 * The number of operations of the '<em>Table</em>' class.

@@ -175,7 +186,7 @@ public interface NattablePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int TABLE_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;

+	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.

@@ -185,7 +196,7 @@ public interface NattablePackage extends EPackage {
 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getIAxis()

 	 * @generated

 	 */

-	int IAXIS = 2;

+	int IAXIS = 1;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

@@ -233,14 +244,14 @@ public interface NattablePackage extends EPackage {
 	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.EObjectAxisImpl <em>EObject Axis</em>}' class.

+	 * 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.EObjectAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getEObjectAxis()

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.IdAxisImpl

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getIdAxis()

 	 * @generated

 	 */

-	int EOBJECT_AXIS = 1;

+	int ID_AXIS = 2;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

@@ -249,25 +260,25 @@ public interface NattablePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int EOBJECT_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;

+	int ID_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;

 

 	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

+	 * The feature id for the '<em><b>Element</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int EOBJECT_AXIS__ELEMENT = IAXIS_FEATURE_COUNT + 0;

+	int ID_AXIS__ELEMENT = IAXIS_FEATURE_COUNT + 0;

 

 	/**

-	 * The number of structural features of the '<em>EObject Axis</em>' class.

+	 * The number of structural features of the '<em>Id Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int EOBJECT_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;

+	int ID_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;

 

 	/**

 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

@@ -276,7 +287,7 @@ public interface NattablePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int EOBJECT_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;

+	int ID_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;

 

 	/**

 	 * The operation id for the '<em>Get Element</em>' operation.

@@ -285,26 +296,26 @@ public interface NattablePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int EOBJECT_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;

+	int ID_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;

 

 	/**

-	 * The number of operations of the '<em>EObject Axis</em>' class.

+	 * The number of operations of the '<em>Id Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int EOBJECT_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

+	int ID_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.IdAxisImpl <em>Id Axis</em>}' class.

+	 * 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.IdAxisImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getIdAxis()

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.EObjectAxisImpl

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getEObjectAxis()

 	 * @generated

 	 */

-	int ID_AXIS = 3;

+	int EOBJECT_AXIS = 3;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

@@ -313,25 +324,25 @@ public interface NattablePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int ID_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;

+	int EOBJECT_AXIS__EANNOTATIONS = IAXIS__EANNOTATIONS;

 

 	/**

-	 * The feature id for the '<em><b>Element</b></em>' attribute.

+	 * The feature id for the '<em><b>Element</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int ID_AXIS__ELEMENT = IAXIS_FEATURE_COUNT + 0;

+	int EOBJECT_AXIS__ELEMENT = IAXIS_FEATURE_COUNT + 0;

 

 	/**

-	 * The number of structural features of the '<em>Id Axis</em>' class.

+	 * The number of structural features of the '<em>EObject Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int ID_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;

+	int EOBJECT_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;

 

 	/**

 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

@@ -340,7 +351,7 @@ public interface NattablePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int ID_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;

+	int EOBJECT_AXIS___GET_EANNOTATION__STRING = IAXIS___GET_EANNOTATION__STRING;

 

 	/**

 	 * The operation id for the '<em>Get Element</em>' operation.

@@ -349,16 +360,16 @@ public interface NattablePackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int ID_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;

+	int EOBJECT_AXIS___GET_ELEMENT = IAXIS___GET_ELEMENT;

 

 	/**

-	 * The number of operations of the '<em>Id Axis</em>' class.

+	 * The number of operations of the '<em>EObject Axis</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int ID_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

+	int EOBJECT_AXIS_OPERATION_COUNT = IAXIS_OPERATION_COUNT + 0;

 

 

 	/**

@@ -372,17 +383,6 @@ public interface NattablePackage extends EPackage {
 	EClass getTable();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#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.Table#getName()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EAttribute getTable_Name();

-

-	/**

 	 * 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 -->

@@ -394,17 +394,6 @@ public interface NattablePackage extends EPackage {
 	EReference getTable_Context();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#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.Table#getDescription()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EAttribute getTable_Description();

-

-	/**

 	 * 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 -->

@@ -416,28 +405,6 @@ public interface NattablePackage extends EPackage {
 	EReference getTable_EditorConfiguration();

 

 	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getVerticalAxisProvider <em>Vertical Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Vertical Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getVerticalAxisProvider()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_VerticalAxisProvider();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getHorizontalAxisProvider <em>Horizontal Axis Provider</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Horizontal Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getHorizontalAxisProvider()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_HorizontalAxisProvider();

-

-	/**

 	 * 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 -->

@@ -449,27 +416,6 @@ public interface NattablePackage extends EPackage {
 	EAttribute getTable_InvertAxis();

 

 	/**

-	 * 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 meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.IAxis <em>IAxis</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -511,6 +457,27 @@ public interface NattablePackage extends EPackage {
 	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 -->

@@ -544,14 +511,6 @@ public interface NattablePackage extends EPackage {
 		EClass TABLE = eINSTANCE.getTable();

 

 		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute TABLE__NAME = eINSTANCE.getTable_Name();

-

-		/**

 		 * The meta object literal for the '<em><b>Context</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

@@ -560,14 +519,6 @@ public interface NattablePackage extends EPackage {
 		EReference TABLE__CONTEXT = eINSTANCE.getTable_Context();

 

 		/**

-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute TABLE__DESCRIPTION = eINSTANCE.getTable_Description();

-

-		/**

 		 * The meta object literal for the '<em><b>Editor Configuration</b></em>' reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

@@ -576,22 +527,6 @@ public interface NattablePackage extends EPackage {
 		EReference TABLE__EDITOR_CONFIGURATION = eINSTANCE.getTable_EditorConfiguration();

 

 		/**

-		 * The meta object literal for the '<em><b>Vertical Axis Provider</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__VERTICAL_AXIS_PROVIDER = eINSTANCE.getTable_VerticalAxisProvider();

-

-		/**

-		 * The meta object literal for the '<em><b>Horizontal Axis Provider</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__HORIZONTAL_AXIS_PROVIDER = eINSTANCE.getTable_HorizontalAxisProvider();

-

-		/**

 		 * The meta object literal for the '<em><b>Invert Axis</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

@@ -600,24 +535,6 @@ public interface NattablePackage extends EPackage {
 		EAttribute TABLE__INVERT_AXIS = eINSTANCE.getTable_InvertAxis();

 

 		/**

-		 * 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();

-

-		/**

 		 * 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 -->

@@ -653,6 +570,24 @@ public interface NattablePackage extends EPackage {
 		 */

 		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/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
index 330eacc14c9..2c1194620f0 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
@@ -12,12 +12,10 @@
  */

 package org.eclipse.papyrus.infra.nattable.model.nattable;

 

-import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.emf.ecore.EObject;

 

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

 

 /**

  * <!-- begin-user-doc -->

@@ -27,12 +25,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.T
  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getName <em>Name</em>}</li>

  *   <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#getDescription <em>Description</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#getVerticalAxisProvider <em>Vertical Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getHorizontalAxisProvider <em>Horizontal Axis Provider</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}</li>

  * </ul>

  * </p>

@@ -41,33 +35,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.T
  * @model

  * @generated

  */

-public interface Table extends EModelElement {

-	/**

-	 * 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.NattablePackage#getTable_Name()

-	 * @model id="true"

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#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);

-

+public interface Table extends AbstractTableConfiguration {

 	/**

 	 * Returns the value of the '<em><b>Context</b></em>' reference.

 	 * <!-- begin-user-doc -->

@@ -95,46 +63,20 @@ public interface Table extends EModelElement {
 	void setContext(EObject 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.NattablePackage#getTable_Description()

-	 * @model

-	 * @generated

-	 */

-	String getDescription();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#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);

-

-	/**

 	 * 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>' containment reference isn't clear,

+	 * 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(TableEditorConfiguration)

+	 * @see #setEditorConfiguration(TableConfiguration)

 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_EditorConfiguration()

 	 * @model required="true"

 	 * @generated

 	 */

-	TableEditorConfiguration getEditorConfiguration();

+	TableConfiguration getEditorConfiguration();

 

 	/**

 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getEditorConfiguration <em>Editor Configuration</em>}' reference.

@@ -144,59 +86,7 @@ public interface Table extends EModelElement {
 	 * @see #getEditorConfiguration()

 	 * @generated

 	 */

-	void setEditorConfiguration(TableEditorConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Vertical Axis Provider</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Vertical 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>Vertical Axis Provider</em>' containment reference.

-	 * @see #setVerticalAxisProvider(AbstractAxisProvider)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_VerticalAxisProvider()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	AbstractAxisProvider getVerticalAxisProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getVerticalAxisProvider <em>Vertical Axis Provider</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Vertical Axis Provider</em>' containment reference.

-	 * @see #getVerticalAxisProvider()

-	 * @generated

-	 */

-	void setVerticalAxisProvider(AbstractAxisProvider value);

-

-	/**

-	 * Returns the value of the '<em><b>Horizontal Axis Provider</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Horizontal 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>Horizontal Axis Provider</em>' containment reference.

-	 * @see #setHorizontalAxisProvider(AbstractAxisProvider)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_HorizontalAxisProvider()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	AbstractAxisProvider getHorizontalAxisProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getHorizontalAxisProvider <em>Horizontal Axis Provider</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Horizontal Axis Provider</em>' containment reference.

-	 * @see #getHorizontalAxisProvider()

-	 * @generated

-	 */

-	void setHorizontalAxisProvider(AbstractAxisProvider value);

+	void setEditorConfiguration(TableConfiguration value);

 

 	/**

 	 * Returns the value of the '<em><b>Invert Axis</b></em>' attribute.

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
index 0fd8e466fad..029af87301f 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
@@ -67,8 +67,8 @@ public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory
 	public EObject create(EClass eClass) {

 		switch (eClass.getClassifierID()) {

 			case NattablePackage.TABLE: return createTable();

-			case NattablePackage.EOBJECT_AXIS: return createEObjectAxis();

 			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$

 		}

@@ -89,9 +89,9 @@ public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EObjectAxis createEObjectAxis() {

-		EObjectAxisImpl eObjectAxis = new EObjectAxisImpl();

-		return eObjectAxis;

+	public IdAxis createIdAxis() {

+		IdAxisImpl idAxis = new IdAxisImpl();

+		return idAxis;

 	}

 

 	/**

@@ -99,9 +99,9 @@ public class NattableFactoryImpl extends EFactoryImpl implements NattableFactory
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public IdAxis createIdAxis() {

-		IdAxisImpl idAxis = new IdAxisImpl();

-		return idAxis;

+	public EObjectAxis createEObjectAxis() {

+		EObjectAxisImpl eObjectAxis = new EObjectAxisImpl();

+		return eObjectAxis;

 	}

 

 	/**

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
index 51ad20ffd62..c88521e42a6 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
@@ -63,21 +63,21 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	private EClass eObjectAxisEClass = null;

+	private EClass iAxisEClass = null;

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	private EClass iAxisEClass = null;

+	private EClass idAxisEClass = null;

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	private EClass idAxisEClass = null;

+	private EClass eObjectAxisEClass = null;

 

 	/**

 	 * Creates an instance of the model <b>Package</b>, registered with

@@ -171,8 +171,8 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getTable_Name() {

-		return (EAttribute)tableEClass.getEStructuralFeatures().get(0);

+	public EReference getTable_Context() {

+		return (EReference)tableEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

@@ -180,7 +180,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EReference getTable_Context() {

+	public EReference getTable_EditorConfiguration() {

 		return (EReference)tableEClass.getEStructuralFeatures().get(1);

 	}

 

@@ -189,7 +189,7 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getTable_Description() {

+	public EAttribute getTable_InvertAxis() {

 		return (EAttribute)tableEClass.getEStructuralFeatures().get(2);

 	}

 

@@ -198,8 +198,8 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EReference getTable_EditorConfiguration() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(3);

+	public EClass getIAxis() {

+		return iAxisEClass;

 	}

 

 	/**

@@ -207,8 +207,8 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EReference getTable_VerticalAxisProvider() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(4);

+	public EOperation getIAxis__GetElement() {

+		return iAxisEClass.getEOperations().get(0);

 	}

 

 	/**

@@ -216,8 +216,8 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EReference getTable_HorizontalAxisProvider() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(5);

+	public EClass getIdAxis() {

+		return idAxisEClass;

 	}

 

 	/**

@@ -225,8 +225,8 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getTable_InvertAxis() {

-		return (EAttribute)tableEClass.getEStructuralFeatures().get(6);

+	public EAttribute getIdAxis_Element() {

+		return (EAttribute)idAxisEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

@@ -252,42 +252,6 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 	 * <!-- 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 NattableFactory getNattableFactory() {

 		return (NattableFactory)getEFactoryInstance();

 	}

@@ -312,22 +276,18 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 

 		// Create classes and their features

 		tableEClass = createEClass(TABLE);

-		createEAttribute(tableEClass, TABLE__NAME);

 		createEReference(tableEClass, TABLE__CONTEXT);

-		createEAttribute(tableEClass, TABLE__DESCRIPTION);

 		createEReference(tableEClass, TABLE__EDITOR_CONFIGURATION);

-		createEReference(tableEClass, TABLE__VERTICAL_AXIS_PROVIDER);

-		createEReference(tableEClass, TABLE__HORIZONTAL_AXIS_PROVIDER);

 		createEAttribute(tableEClass, TABLE__INVERT_AXIS);

 

-		eObjectAxisEClass = createEClass(EOBJECT_AXIS);

-		createEReference(eObjectAxisEClass, EOBJECT_AXIS__ELEMENT);

-

 		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);

 	}

 

 	/**

@@ -371,24 +331,17 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 		// Set bounds for type parameters

 

 		// Add supertypes to classes

-		tableEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

-		eObjectAxisEClass.getESuperTypes().add(this.getIAxis());

+		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$

-		initEAttribute(getTable_Name(), ecorePackage.getEString(), "name", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$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$

-		initEAttribute(getTable_Description(), ecorePackage.getEString(), "description", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_EditorConfiguration(), theNattableconfigurationPackage.getTableEditorConfiguration(), 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$

-		initEReference(getTable_VerticalAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "verticalAxisProvider", 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$

-		initEReference(getTable_HorizontalAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "horizontalAxisProvider", 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$

+		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(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$

-

 		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$

@@ -396,6 +349,9 @@ public class NattablePackageImpl extends EPackageImpl implements NattablePackage
 		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);

 	}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
index d25d2159721..afcce26802f 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
@@ -13,21 +13,19 @@
 package org.eclipse.papyrus.infra.nattable.model.nattable.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.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.NattablePackage;

 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

 

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

 

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableConfigurationImpl;

 

 /**

  * <!-- begin-user-doc -->

@@ -36,39 +34,15 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.T
  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getName <em>Name</em>}</li>

  *   <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#getDescription <em>Description</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#getVerticalAxisProvider <em>Vertical Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getHorizontalAxisProvider <em>Horizontal Axis Provider</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 EModelElementImpl implements Table {

-	/**

-	 * 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;

-

+public class TableImpl extends AbstractTableConfigurationImpl implements Table {

 	/**

 	 * The cached value of the '{@link #getContext() <em>Context</em>}' reference.

 	 * <!-- begin-user-doc -->

@@ -80,26 +54,6 @@ public class TableImpl extends EModelElementImpl implements Table {
 	protected EObject context;

 

 	/**

-	 * 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;

-

-	/**

 	 * The cached value of the '{@link #getEditorConfiguration() <em>Editor Configuration</em>}' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -107,27 +61,7 @@ public class TableImpl extends EModelElementImpl implements Table {
 	 * @generated

 	 * @ordered

 	 */

-	protected TableEditorConfiguration editorConfiguration;

-

-	/**

-	 * The cached value of the '{@link #getVerticalAxisProvider() <em>Vertical Axis Provider</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getVerticalAxisProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected AbstractAxisProvider verticalAxisProvider;

-

-	/**

-	 * The cached value of the '{@link #getHorizontalAxisProvider() <em>Horizontal Axis Provider</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getHorizontalAxisProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected AbstractAxisProvider horizontalAxisProvider;

+	protected TableConfiguration editorConfiguration;

 

 	/**

 	 * The default value of the '{@link #isInvertAxis() <em>Invert Axis</em>}' attribute.

@@ -173,27 +107,6 @@ public class TableImpl extends EModelElementImpl implements Table {
 	 * <!-- 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, NattablePackage.TABLE__NAME, oldName, name));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

 	public EObject getContext() {

 		if (context != null && context.eIsProxy()) {

 			InternalEObject oldContext = (InternalEObject)context;

@@ -232,31 +145,10 @@ public class TableImpl extends EModelElementImpl implements Table {
 	 * <!-- 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, NattablePackage.TABLE__DESCRIPTION, oldDescription, description));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public TableEditorConfiguration getEditorConfiguration() {

+	public TableConfiguration getEditorConfiguration() {

 		if (editorConfiguration != null && editorConfiguration.eIsProxy()) {

 			InternalEObject oldEditorConfiguration = (InternalEObject)editorConfiguration;

-			editorConfiguration = (TableEditorConfiguration)eResolveProxy(oldEditorConfiguration);

+			editorConfiguration = (TableConfiguration)eResolveProxy(oldEditorConfiguration);

 			if (editorConfiguration != oldEditorConfiguration) {

 				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.TABLE__EDITOR_CONFIGURATION, oldEditorConfiguration, editorConfiguration));

@@ -270,7 +162,7 @@ public class TableImpl extends EModelElementImpl implements Table {
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public TableEditorConfiguration basicGetEditorConfiguration() {

+	public TableConfiguration basicGetEditorConfiguration() {

 		return editorConfiguration;

 	}

 

@@ -279,8 +171,8 @@ public class TableImpl extends EModelElementImpl implements Table {
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public void setEditorConfiguration(TableEditorConfiguration newEditorConfiguration) {

-		TableEditorConfiguration oldEditorConfiguration = editorConfiguration;

+	public void setEditorConfiguration(TableConfiguration newEditorConfiguration) {

+		TableConfiguration oldEditorConfiguration = editorConfiguration;

 		editorConfiguration = newEditorConfiguration;

 		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__EDITOR_CONFIGURATION, oldEditorConfiguration, editorConfiguration));

@@ -291,92 +183,6 @@ public class TableImpl extends EModelElementImpl implements Table {
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public AbstractAxisProvider getVerticalAxisProvider() {

-		return verticalAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetVerticalAxisProvider(AbstractAxisProvider newVerticalAxisProvider, NotificationChain msgs) {

-		AbstractAxisProvider oldVerticalAxisProvider = verticalAxisProvider;

-		verticalAxisProvider = newVerticalAxisProvider;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__VERTICAL_AXIS_PROVIDER, oldVerticalAxisProvider, newVerticalAxisProvider);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setVerticalAxisProvider(AbstractAxisProvider newVerticalAxisProvider) {

-		if (newVerticalAxisProvider != verticalAxisProvider) {

-			NotificationChain msgs = null;

-			if (verticalAxisProvider != null)

-				msgs = ((InternalEObject)verticalAxisProvider).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__VERTICAL_AXIS_PROVIDER, null, msgs);

-			if (newVerticalAxisProvider != null)

-				msgs = ((InternalEObject)newVerticalAxisProvider).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__VERTICAL_AXIS_PROVIDER, null, msgs);

-			msgs = basicSetVerticalAxisProvider(newVerticalAxisProvider, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__VERTICAL_AXIS_PROVIDER, newVerticalAxisProvider, newVerticalAxisProvider));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AbstractAxisProvider getHorizontalAxisProvider() {

-		return horizontalAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetHorizontalAxisProvider(AbstractAxisProvider newHorizontalAxisProvider, NotificationChain msgs) {

-		AbstractAxisProvider oldHorizontalAxisProvider = horizontalAxisProvider;

-		horizontalAxisProvider = newHorizontalAxisProvider;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__HORIZONTAL_AXIS_PROVIDER, oldHorizontalAxisProvider, newHorizontalAxisProvider);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setHorizontalAxisProvider(AbstractAxisProvider newHorizontalAxisProvider) {

-		if (newHorizontalAxisProvider != horizontalAxisProvider) {

-			NotificationChain msgs = null;

-			if (horizontalAxisProvider != null)

-				msgs = ((InternalEObject)horizontalAxisProvider).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__HORIZONTAL_AXIS_PROVIDER, null, msgs);

-			if (newHorizontalAxisProvider != null)

-				msgs = ((InternalEObject)newHorizontalAxisProvider).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattablePackage.TABLE__HORIZONTAL_AXIS_PROVIDER, null, msgs);

-			msgs = basicSetHorizontalAxisProvider(newHorizontalAxisProvider, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.TABLE__HORIZONTAL_AXIS_PROVIDER, newHorizontalAxisProvider, newHorizontalAxisProvider));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

 	public boolean isInvertAxis() {

 		return invertAxis;

 	}

@@ -399,38 +205,14 @@ public class TableImpl extends EModelElementImpl implements Table {
 	 * @generated

 	 */

 	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattablePackage.TABLE__VERTICAL_AXIS_PROVIDER:

-				return basicSetVerticalAxisProvider(null, msgs);

-			case NattablePackage.TABLE__HORIZONTAL_AXIS_PROVIDER:

-				return basicSetHorizontalAxisProvider(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 NattablePackage.TABLE__NAME:

-				return getName();

 			case NattablePackage.TABLE__CONTEXT:

 				if (resolve) return getContext();

 				return basicGetContext();

-			case NattablePackage.TABLE__DESCRIPTION:

-				return getDescription();

 			case NattablePackage.TABLE__EDITOR_CONFIGURATION:

 				if (resolve) return getEditorConfiguration();

 				return basicGetEditorConfiguration();

-			case NattablePackage.TABLE__VERTICAL_AXIS_PROVIDER:

-				return getVerticalAxisProvider();

-			case NattablePackage.TABLE__HORIZONTAL_AXIS_PROVIDER:

-				return getHorizontalAxisProvider();

 			case NattablePackage.TABLE__INVERT_AXIS:

 				return isInvertAxis();

 		}

@@ -445,23 +227,11 @@ public class TableImpl extends EModelElementImpl implements Table {
 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch (featureID) {

-			case NattablePackage.TABLE__NAME:

-				setName((String)newValue);

-				return;

 			case NattablePackage.TABLE__CONTEXT:

 				setContext((EObject)newValue);

 				return;

-			case NattablePackage.TABLE__DESCRIPTION:

-				setDescription((String)newValue);

-				return;

 			case NattablePackage.TABLE__EDITOR_CONFIGURATION:

-				setEditorConfiguration((TableEditorConfiguration)newValue);

-				return;

-			case NattablePackage.TABLE__VERTICAL_AXIS_PROVIDER:

-				setVerticalAxisProvider((AbstractAxisProvider)newValue);

-				return;

-			case NattablePackage.TABLE__HORIZONTAL_AXIS_PROVIDER:

-				setHorizontalAxisProvider((AbstractAxisProvider)newValue);

+				setEditorConfiguration((TableConfiguration)newValue);

 				return;

 			case NattablePackage.TABLE__INVERT_AXIS:

 				setInvertAxis((Boolean)newValue);

@@ -478,23 +248,11 @@ public class TableImpl extends EModelElementImpl implements Table {
 	@Override

 	public void eUnset(int featureID) {

 		switch (featureID) {

-			case NattablePackage.TABLE__NAME:

-				setName(NAME_EDEFAULT);

-				return;

 			case NattablePackage.TABLE__CONTEXT:

 				setContext((EObject)null);

 				return;

-			case NattablePackage.TABLE__DESCRIPTION:

-				setDescription(DESCRIPTION_EDEFAULT);

-				return;

 			case NattablePackage.TABLE__EDITOR_CONFIGURATION:

-				setEditorConfiguration((TableEditorConfiguration)null);

-				return;

-			case NattablePackage.TABLE__VERTICAL_AXIS_PROVIDER:

-				setVerticalAxisProvider((AbstractAxisProvider)null);

-				return;

-			case NattablePackage.TABLE__HORIZONTAL_AXIS_PROVIDER:

-				setHorizontalAxisProvider((AbstractAxisProvider)null);

+				setEditorConfiguration((TableConfiguration)null);

 				return;

 			case NattablePackage.TABLE__INVERT_AXIS:

 				setInvertAxis(INVERT_AXIS_EDEFAULT);

@@ -511,18 +269,10 @@ public class TableImpl extends EModelElementImpl implements Table {
 	@Override

 	public boolean eIsSet(int featureID) {

 		switch (featureID) {

-			case NattablePackage.TABLE__NAME:

-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

 			case NattablePackage.TABLE__CONTEXT:

 				return context != null;

-			case NattablePackage.TABLE__DESCRIPTION:

-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);

 			case NattablePackage.TABLE__EDITOR_CONFIGURATION:

 				return editorConfiguration != null;

-			case NattablePackage.TABLE__VERTICAL_AXIS_PROVIDER:

-				return verticalAxisProvider != null;

-			case NattablePackage.TABLE__HORIZONTAL_AXIS_PROVIDER:

-				return horizontalAxisProvider != null;

 			case NattablePackage.TABLE__INVERT_AXIS:

 				return invertAxis != INVERT_AXIS_EDEFAULT;

 		}

@@ -539,11 +289,7 @@ public class TableImpl extends EModelElementImpl implements Table {
 		if (eIsProxy()) return super.toString();

 

 		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: "); //$NON-NLS-1$

-		result.append(name);

-		result.append(", description: "); //$NON-NLS-1$

-		result.append(description);

-		result.append(", invertAxis: "); //$NON-NLS-1$

+		result.append(" (invertAxis: "); //$NON-NLS-1$

 		result.append(invertAxis);

 		result.append(')');

 		return result.toString();

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractAxisConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractAxisConfiguration.java
index ea17a82c3f8..d9b6184049e 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractAxisConfiguration.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractAxisConfiguration.java
@@ -13,7 +13,6 @@
 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;

 

 /**

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/HeaderIndexStyle.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/HeaderIndexStyle.java
deleted file mode 100644
index ff78ceb676a..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/HeaderIndexStyle.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>Header Index Style</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getHeaderIndexStyle()

- * @model

- * @generated

- */

-public enum HeaderIndexStyle 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>Header Index Style</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final HeaderIndexStyle[] VALUES_ARRAY =

-		new HeaderIndexStyle[] {

-			NUMERIC,

-			ALPHABETIC,

-		};

-

-	/**

-	 * A public read-only list of all the '<em><b>Header Index Style</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<HeaderIndexStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Header Index Style</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static HeaderIndexStyle get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			HeaderIndexStyle result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Header Index Style</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static HeaderIndexStyle getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			HeaderIndexStyle result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Header Index Style</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static HeaderIndexStyle 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 HeaderIndexStyle(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;

-	}

-	

-} //HeaderIndexStyle

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
index fbd5fcda99c..6fb24e4b27c 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
@@ -224,6 +224,7 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	 */

 	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 -->

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractAxisConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractAxisConfigurationImpl.java
index fecae09c58e..591779654d0 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractAxisConfigurationImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractAxisConfigurationImpl.java
@@ -14,16 +14,12 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurat
 

 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;

 

 /**

@@ -145,6 +141,7 @@ public class AbstractAxisConfigurationImpl extends EModelElementImpl implements
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

+	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch (featureID) {

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/DefaultAxisConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/DefaultAxisConfigurationImpl.java
index 7f42c041054..73316ab23ba 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/DefaultAxisConfigurationImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/DefaultAxisConfigurationImpl.java
@@ -13,8 +13,11 @@
 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;

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
index ca856e51176..1cbfdcc4e7f 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
@@ -18,19 +18,29 @@ 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;

 

 /**

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
index 29fdd13f14f..52aae26c7a4 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
@@ -13,9 +13,12 @@
 package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

 

 import org.eclipse.emf.common.util.EList;

+

 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;

 

 /**

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/EMFFeatureValueAxisProviderImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/EMFFeatureValueAxisProviderImpl.java
index 76a495375c7..5a93474f503 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/EMFFeatureValueAxisProviderImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/EMFFeatureValueAxisProviderImpl.java
@@ -13,10 +13,13 @@
 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;

 

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/AbstractTableConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/AbstractTableConfiguration.java
index 0720c335549..f099a211c84 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/AbstractTableConfiguration.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/AbstractTableConfiguration.java
@@ -130,7 +130,7 @@ public interface AbstractTableConfiguration extends EModelElement {
 	 * @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 id="true"

+	 * @model

 	 * @generated

 	 */

 	String getName();

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/AbstractTableCreationTester.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/AbstractTableCreationTester.java
new file mode 100644
index 00000000000..4c38e1d5382
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/AbstractTableCreationTester.java
@@ -0,0 +1,36 @@
+/**

+ * 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;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Abstract Table Creation Tester</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getAbstractTableCreationTester()

+ * @model abstract="true"

+ * @generated

+ */

+public interface AbstractTableCreationTester extends EObject {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @model kind="operation"

+	 * @generated

+	 */

+	Object getTester();

+

+} // AbstractTableCreationTester

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/JavaTableCreationTester.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/JavaTableCreationTester.java
new file mode 100644
index 00000000000..85cf31fe7b9
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/JavaTableCreationTester.java
@@ -0,0 +1,59 @@
+/**

+ * 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;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Java Table Creation Tester</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.JavaTableCreationTester#getTester <em>Tester</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getJavaTableCreationTester()

+ * @model

+ * @generated

+ */

+public interface JavaTableCreationTester extends AbstractTableCreationTester {

+	/**

+	 * 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.nattableconfiguration.NattableconfigurationPackage#getJavaTableCreationTester_Tester()

+	 * @model required="true"

+	 * @generated

+	 */

+	String getTester();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.JavaTableCreationTester#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);

+

+} // JavaTableCreationTester

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
index 4d8a0e69fb5..e1564832d2d 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
@@ -32,13 +32,22 @@ public interface NattableconfigurationFactory extends EFactory {
 	NattableconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationFactoryImpl.init();

 

 	/**

-	 * Returns a new object of class '<em>Table Editor Configuration</em>'.

+	 * Returns a new object of class '<em>Table Configuration</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Table Editor Configuration</em>'.

+	 * @return a new object of class '<em>Table Configuration</em>'.

 	 * @generated

 	 */

-	TableEditorConfiguration createTableEditorConfiguration();

+	TableConfiguration createTableConfiguration();

+

+	/**

+	 * Returns a new object of class '<em>Java Table Creation Tester</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Java Table Creation Tester</em>'.

+	 * @generated

+	 */

+	JavaTableCreationTester createJavaTableCreationTester();

 

 	/**

 	 * Returns the package supported by this factory.

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
index d1aaecee7cf..34987acee75 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
@@ -15,6 +15,7 @@ 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.EOperation;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.EcorePackage;

@@ -69,14 +70,14 @@ public interface NattableconfigurationPackage extends EPackage {
 	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.TableEditorConfigurationImpl <em>Table Editor Configuration</em>}' class.

+	 * 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.TableEditorConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableEditorConfiguration()

+	 * @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 TABLE_EDITOR_CONFIGURATION = 0;

+	int ABSTRACT_TABLE_CONFIGURATION = 0;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

@@ -85,25 +86,25 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int TABLE_EDITOR_CONFIGURATION__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

+	int ABSTRACT_TABLE_CONFIGURATION__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

 

 	/**

-	 * The feature id for the '<em><b>Vertical Axis Provider</b></em>' containment reference.

+	 * The feature id for the '<em><b>Row Axis Provider</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;

+	int ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;

 

 	/**

-	 * The feature id for the '<em><b>Horizontal Axis Provider</b></em>' containment reference.

+	 * The feature id for the '<em><b>Column Axis Provider</b></em>' containment reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;

+	int ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;

 

 	/**

 	 * The feature id for the '<em><b>Editor Declaration</b></em>' attribute.

@@ -112,25 +113,34 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int TABLE_EDITOR_CONFIGURATION__EDITOR_DECLARATION = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;

+	int ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;

 

 	/**

-	 * The feature id for the '<em><b>Type</b></em>' attribute.

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int TABLE_EDITOR_CONFIGURATION__TYPE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;

+	int ABSTRACT_TABLE_CONFIGURATION__NAME = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;

 

 	/**

-	 * The number of structural features of the '<em>Table Editor Configuration</em>' class.

+	 * The feature id for the '<em><b>Description</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int TABLE_EDITOR_CONFIGURATION_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 4;

+	int ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 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 = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 5;

 

 	/**

 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

@@ -139,26 +149,26 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int TABLE_EDITOR_CONFIGURATION___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

+	int ABSTRACT_TABLE_CONFIGURATION___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

 

 	/**

-	 * The number of operations of the '<em>Table Editor Configuration</em>' class.

+	 * The number of operations of the '<em>Abstract Table Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int TABLE_EDITOR_CONFIGURATION_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;

+	int ABSTRACT_TABLE_CONFIGURATION_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableConfigurationImpl <em>Abstract Table Configuration</em>}' class.

+	 * 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.AbstractTableConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getAbstractTableConfiguration()

+	 * @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 ABSTRACT_TABLE_CONFIGURATION = 1;

+	int TABLE_CONFIGURATION = 1;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

@@ -167,7 +177,7 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int ABSTRACT_TABLE_CONFIGURATION__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;

+	int TABLE_CONFIGURATION__EANNOTATIONS = ABSTRACT_TABLE_CONFIGURATION__EANNOTATIONS;

 

 	/**

 	 * The feature id for the '<em><b>Row Axis Provider</b></em>' containment reference.

@@ -176,7 +186,7 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;

+	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.

@@ -185,7 +195,7 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;

+	int TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER = ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER;

 

 	/**

 	 * The feature id for the '<em><b>Editor Declaration</b></em>' attribute.

@@ -194,7 +204,7 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;

+	int TABLE_CONFIGURATION__EDITOR_DECLARATION = ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION;

 

 	/**

 	 * The feature id for the '<em><b>Name</b></em>' attribute.

@@ -203,7 +213,7 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int ABSTRACT_TABLE_CONFIGURATION__NAME = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;

+	int TABLE_CONFIGURATION__NAME = ABSTRACT_TABLE_CONFIGURATION__NAME;

 

 	/**

 	 * The feature id for the '<em><b>Description</b></em>' attribute.

@@ -212,16 +222,43 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 4;

+	int TABLE_CONFIGURATION__DESCRIPTION = ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION;

 

 	/**

-	 * The number of structural features of the '<em>Abstract Table Configuration</em>' class.

+	 * The feature id for the '<em><b>Type</b></em>' attribute.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int ABSTRACT_TABLE_CONFIGURATION_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 5;

+	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 operation id for the '<em>Get EAnnotation</em>' operation.

@@ -230,81 +267,110 @@ public interface NattableconfigurationPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int ABSTRACT_TABLE_CONFIGURATION___GET_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT___GET_EANNOTATION__STRING;

+	int TABLE_CONFIGURATION___GET_EANNOTATION__STRING = ABSTRACT_TABLE_CONFIGURATION___GET_EANNOTATION__STRING;

 

 	/**

-	 * The number of operations of the '<em>Abstract Table Configuration</em>' class.

+	 * The number of operations of the '<em>Table Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int ABSTRACT_TABLE_CONFIGURATION_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;

+	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.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableCreationTesterImpl <em>Abstract Table Creation Tester</em>}' class.

 	 * <!-- 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()

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableCreationTesterImpl

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getAbstractTableCreationTester()

 	 * @generated

 	 */

-	int CELL_EDITOR_DECLARATION = 2;

+	int ABSTRACT_TABLE_CREATION_TESTER = 2;

 

+	/**

+	 * The number of structural features of the '<em>Abstract Table Creation Tester</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int ABSTRACT_TABLE_CREATION_TESTER_FEATURE_COUNT = 0;

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration <em>Table Editor Configuration</em>}'.

+	 * The operation id for the '<em>Get Tester</em>' operation.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Table Editor Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration

 	 * @generated

+	 * @ordered

 	 */

-	EClass getTableEditorConfiguration();

+	int ABSTRACT_TABLE_CREATION_TESTER___GET_TESTER = 0;

 

 	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration#getVerticalAxisProvider <em>Vertical Axis Provider</em>}'.

+	 * The number of operations of the '<em>Abstract Table Creation Tester</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Vertical Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration#getVerticalAxisProvider()

-	 * @see #getTableEditorConfiguration()

 	 * @generated

+	 * @ordered

 	 */

-	EReference getTableEditorConfiguration_VerticalAxisProvider();

+	int ABSTRACT_TABLE_CREATION_TESTER_OPERATION_COUNT = 1;

 

 	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration#getHorizontalAxisProvider <em>Horizontal Axis Provider</em>}'.

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.JavaTableCreationTesterImpl <em>Java Table Creation Tester</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Horizontal Axis Provider</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration#getHorizontalAxisProvider()

-	 * @see #getTableEditorConfiguration()

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.JavaTableCreationTesterImpl

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getJavaTableCreationTester()

 	 * @generated

 	 */

-	EReference getTableEditorConfiguration_HorizontalAxisProvider();

+	int JAVA_TABLE_CREATION_TESTER = 3;

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration#getEditorDeclaration <em>Editor Declaration</em>}'.

+	 * The feature id for the '<em><b>Tester</b></em>' attribute.

 	 * <!-- 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.TableEditorConfiguration#getEditorDeclaration()

-	 * @see #getTableEditorConfiguration()

 	 * @generated

+	 * @ordered

 	 */

-	EAttribute getTableEditorConfiguration_EditorDeclaration();

+	int JAVA_TABLE_CREATION_TESTER__TESTER = ABSTRACT_TABLE_CREATION_TESTER_FEATURE_COUNT + 0;

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration#getType <em>Type</em>}'.

+	 * The number of structural features of the '<em>Java Table Creation Tester</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int JAVA_TABLE_CREATION_TESTER_FEATURE_COUNT = ABSTRACT_TABLE_CREATION_TESTER_FEATURE_COUNT + 1;

+

+	/**

+	 * The operation id for the '<em>Get Tester</em>' operation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int JAVA_TABLE_CREATION_TESTER___GET_TESTER = ABSTRACT_TABLE_CREATION_TESTER___GET_TESTER;

+

+	/**

+	 * The number of operations of the '<em>Java Table Creation Tester</em>' class.

 	 * <!-- 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.TableEditorConfiguration#getType()

-	 * @see #getTableEditorConfiguration()

 	 * @generated

+	 * @ordered

 	 */

-	EAttribute getTableEditorConfiguration_Type();

+	int JAVA_TABLE_CREATION_TESTER_OPERATION_COUNT = ABSTRACT_TABLE_CREATION_TESTER_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 = 4;

+

 

 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration <em>Abstract Table Configuration</em>}'.

@@ -372,6 +438,90 @@ public interface NattableconfigurationPackage extends EPackage {
 	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 class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableCreationTester <em>Abstract Table Creation Tester</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Abstract Table Creation Tester</em>'.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableCreationTester

+	 * @generated

+	 */

+	EClass getAbstractTableCreationTester();

+

+	/**

+	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableCreationTester#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.nattableconfiguration.AbstractTableCreationTester#getTester()

+	 * @generated

+	 */

+	EOperation getAbstractTableCreationTester__GetTester();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.JavaTableCreationTester <em>Java Table Creation Tester</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Java Table Creation Tester</em>'.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.JavaTableCreationTester

+	 * @generated

+	 */

+	EClass getJavaTableCreationTester();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.JavaTableCreationTester#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.nattableconfiguration.JavaTableCreationTester#getTester()

+	 * @see #getJavaTableCreationTester()

+	 * @generated

+	 */

+	EAttribute getJavaTableCreationTester_Tester();

+

+	/**

 	 * 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 -->

@@ -405,30 +555,30 @@ public interface NattableconfigurationPackage extends EPackage {
 	 */

 	interface Literals {

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableEditorConfigurationImpl <em>Table Editor Configuration</em>}' class.

+		 * 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.TableEditorConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableEditorConfiguration()

+		 * @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 TABLE_EDITOR_CONFIGURATION = eINSTANCE.getTableEditorConfiguration();

+		EClass ABSTRACT_TABLE_CONFIGURATION = eINSTANCE.getAbstractTableConfiguration();

 

 		/**

-		 * The meta object literal for the '<em><b>Vertical Axis Provider</b></em>' containment reference feature.

+		 * The meta object literal for the '<em><b>Row Axis Provider</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EReference TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER = eINSTANCE.getTableEditorConfiguration_VerticalAxisProvider();

+		EReference ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER = eINSTANCE.getAbstractTableConfiguration_RowAxisProvider();

 

 		/**

-		 * The meta object literal for the '<em><b>Horizontal Axis Provider</b></em>' containment reference feature.

+		 * The meta object literal for the '<em><b>Column Axis Provider</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EReference TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER = eINSTANCE.getTableEditorConfiguration_HorizontalAxisProvider();

+		EReference ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER = eINSTANCE.getAbstractTableConfiguration_ColumnAxisProvider();

 

 		/**

 		 * The meta object literal for the '<em><b>Editor Declaration</b></em>' attribute feature.

@@ -436,7 +586,33 @@ public interface NattableconfigurationPackage extends EPackage {
 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EAttribute TABLE_EDITOR_CONFIGURATION__EDITOR_DECLARATION = eINSTANCE.getTableEditorConfiguration_EditorDeclaration();

+		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.

@@ -444,57 +620,59 @@ public interface NattableconfigurationPackage extends EPackage {
 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EAttribute TABLE_EDITOR_CONFIGURATION__TYPE = eINSTANCE.getTableEditorConfiguration_Type();

+		EAttribute TABLE_CONFIGURATION__TYPE = eINSTANCE.getTableConfiguration_Type();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableConfigurationImpl <em>Abstract Table Configuration</em>}' class.

+		 * The meta object literal for the '<em><b>Icon Path</b></em>' attribute feature.

 		 * <!-- 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();

+		EAttribute TABLE_CONFIGURATION__ICON_PATH = eINSTANCE.getTableConfiguration_IconPath();

 

 		/**

-		 * The meta object literal for the '<em><b>Row Axis Provider</b></em>' containment reference feature.

+		 * The meta object literal for the '<em><b>Creation Tester</b></em>' containment reference feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EReference ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER = eINSTANCE.getAbstractTableConfiguration_RowAxisProvider();

+		EReference TABLE_CONFIGURATION__CREATION_TESTER = eINSTANCE.getTableConfiguration_CreationTester();

 

 		/**

-		 * The meta object literal for the '<em><b>Column Axis Provider</b></em>' containment reference feature.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableCreationTesterImpl <em>Abstract Table Creation Tester</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.AbstractTableCreationTesterImpl

+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getAbstractTableCreationTester()

 		 * @generated

 		 */

-		EReference ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER = eINSTANCE.getAbstractTableConfiguration_ColumnAxisProvider();

+		EClass ABSTRACT_TABLE_CREATION_TESTER = eINSTANCE.getAbstractTableCreationTester();

 

 		/**

-		 * The meta object literal for the '<em><b>Editor Declaration</b></em>' attribute feature.

+		 * The meta object literal for the '<em><b>Get Tester</b></em>' operation.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EAttribute ABSTRACT_TABLE_CONFIGURATION__EDITOR_DECLARATION = eINSTANCE.getAbstractTableConfiguration_EditorDeclaration();

+		EOperation ABSTRACT_TABLE_CREATION_TESTER___GET_TESTER = eINSTANCE.getAbstractTableCreationTester__GetTester();

 

 		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.JavaTableCreationTesterImpl <em>Java Table Creation Tester</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.JavaTableCreationTesterImpl

+		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getJavaTableCreationTester()

 		 * @generated

 		 */

-		EAttribute ABSTRACT_TABLE_CONFIGURATION__NAME = eINSTANCE.getAbstractTableConfiguration_Name();

+		EClass JAVA_TABLE_CREATION_TESTER = eINSTANCE.getJavaTableCreationTester();

 

 		/**

-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.

+		 * The meta object literal for the '<em><b>Tester</b></em>' attribute feature.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EAttribute ABSTRACT_TABLE_CONFIGURATION__DESCRIPTION = eINSTANCE.getAbstractTableConfiguration_Description();

+		EAttribute JAVA_TABLE_CREATION_TESTER__TESTER = eINSTANCE.getJavaTableCreationTester_Tester();

 

 		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration <em>Cell Editor Declaration</em>}' enum.

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
new file mode 100644
index 00000000000..28a2ccd9028
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
@@ -0,0 +1,113 @@
+/**

+ * 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;

+

+

+/**

+ * <!-- 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(AbstractTableCreationTester)

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_CreationTester()

+	 * @model containment="true"

+	 * @generated

+	 */

+	AbstractTableCreationTester 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(AbstractTableCreationTester value);

+

+} // TableConfiguration

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableEditorConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableEditorConfiguration.java
deleted file mode 100644
index 0edcb1470a5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableEditorConfiguration.java
+++ /dev/null
@@ -1,147 +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.EModelElement;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table Editor Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration#getVerticalAxisProvider <em>Vertical Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration#getHorizontalAxisProvider <em>Horizontal Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration#getEditorDeclaration <em>Editor Declaration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration#getType <em>Type</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableEditorConfiguration()

- * @model

- * @generated

- */

-public interface TableEditorConfiguration extends EModelElement {

-	/**

-	 * Returns the value of the '<em><b>Vertical Axis Provider</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Vertical 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>Vertical Axis Provider</em>' containment reference.

-	 * @see #setVerticalAxisProvider(AbstractAxisProvider)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableEditorConfiguration_VerticalAxisProvider()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	AbstractAxisProvider getVerticalAxisProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration#getVerticalAxisProvider <em>Vertical Axis Provider</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Vertical Axis Provider</em>' containment reference.

-	 * @see #getVerticalAxisProvider()

-	 * @generated

-	 */

-	void setVerticalAxisProvider(AbstractAxisProvider value);

-

-	/**

-	 * Returns the value of the '<em><b>Horizontal Axis Provider</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Horizontal 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>Horizontal Axis Provider</em>' containment reference.

-	 * @see #setHorizontalAxisProvider(AbstractAxisProvider)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableEditorConfiguration_HorizontalAxisProvider()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	AbstractAxisProvider getHorizontalAxisProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration#getHorizontalAxisProvider <em>Horizontal Axis Provider</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Horizontal Axis Provider</em>' containment reference.

-	 * @see #getHorizontalAxisProvider()

-	 * @generated

-	 */

-	void setHorizontalAxisProvider(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#getTableEditorConfiguration_EditorDeclaration()

-	 * @model default="COLUMN" required="true"

-	 * @generated

-	 */

-	CellEditorDeclaration getEditorDeclaration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration#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>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#getTableEditorConfiguration_Type()

-	 * @model id="true" required="true"

-	 * @generated

-	 */

-	String getType();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration#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);

-

-} // TableEditorConfiguration

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/AbstractTableCreationTesterImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/AbstractTableCreationTesterImpl.java
new file mode 100644
index 00000000000..d6f502799f5
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/AbstractTableCreationTesterImpl.java
@@ -0,0 +1,80 @@
+/**

+ * 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 java.lang.reflect.InvocationTargetException;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableCreationTester;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Abstract Table Creation Tester</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * </p>

+ *

+ * @generated

+ */

+public abstract class AbstractTableCreationTesterImpl extends MinimalEObjectImpl.Container implements AbstractTableCreationTester {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected AbstractTableCreationTesterImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return NattableconfigurationPackage.Literals.ABSTRACT_TABLE_CREATION_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 NattableconfigurationPackage.ABSTRACT_TABLE_CREATION_TESTER___GET_TESTER:

+				return getTester();

+		}

+		return super.eInvoke(operationID, arguments);

+	}

+

+} //AbstractTableCreationTesterImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/JavaTableCreationTesterImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/JavaTableCreationTesterImpl.java
new file mode 100644
index 00000000000..cde87f761c5
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/JavaTableCreationTesterImpl.java
@@ -0,0 +1,172 @@
+/**

+ * 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.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.JavaTableCreationTester;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Java Table Creation Tester</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.JavaTableCreationTesterImpl#getTester <em>Tester</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class JavaTableCreationTesterImpl extends AbstractTableCreationTesterImpl implements JavaTableCreationTester {

+	/**

+	 * 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 JavaTableCreationTesterImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return NattableconfigurationPackage.Literals.JAVA_TABLE_CREATION_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, NattableconfigurationPackage.JAVA_TABLE_CREATION_TESTER__TESTER, oldTester, tester));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case NattableconfigurationPackage.JAVA_TABLE_CREATION_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 NattableconfigurationPackage.JAVA_TABLE_CREATION_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 NattableconfigurationPackage.JAVA_TABLE_CREATION_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 NattableconfigurationPackage.JAVA_TABLE_CREATION_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();

+	}

+

+} //JavaTableCreationTesterImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
index 56ac96b758d..21165c96a8a 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
@@ -67,7 +67,8 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
 	@Override

 	public EObject create(EClass eClass) {

 		switch (eClass.getClassifierID()) {

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION: return createTableEditorConfiguration();

+			case NattableconfigurationPackage.TABLE_CONFIGURATION: return createTableConfiguration();

+			case NattableconfigurationPackage.JAVA_TABLE_CREATION_TESTER: return createJavaTableCreationTester();

 			default:

 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

@@ -108,9 +109,19 @@ public class NattableconfigurationFactoryImpl extends EFactoryImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public TableEditorConfiguration createTableEditorConfiguration() {

-		TableEditorConfigurationImpl tableEditorConfiguration = new TableEditorConfigurationImpl();

-		return tableEditorConfiguration;

+	public TableConfiguration createTableConfiguration() {

+		TableConfigurationImpl tableConfiguration = new TableConfigurationImpl();

+		return tableConfiguration;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public JavaTableCreationTester createJavaTableCreationTester() {

+		JavaTableCreationTesterImpl javaTableCreationTester = new JavaTableCreationTesterImpl();

+		return javaTableCreationTester;

 	}

 

 	/**

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
index df793ef7259..278fd055602 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
@@ -15,6 +15,7 @@ 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.EOperation;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.EcorePackage;

@@ -26,16 +27,20 @@ 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.AbstractTableCreationTester;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.JavaTableCreationTester;

 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.TableEditorConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

 

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

 

@@ -53,14 +58,28 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	private EClass tableEditorConfigurationEClass = null;

+	private EClass abstractTableConfigurationEClass = null;

 

 	/**

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	private EClass abstractTableConfigurationEClass = null;

+	private EClass tableConfigurationEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass abstractTableCreationTesterEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass javaTableCreationTesterEClass = null;

 

 	/**

 	 * <!-- begin-user-doc -->

@@ -152,8 +171,8 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EClass getTableEditorConfiguration() {

-		return tableEditorConfigurationEClass;

+	public EClass getAbstractTableConfiguration() {

+		return abstractTableConfigurationEClass;

 	}

 

 	/**

@@ -161,8 +180,8 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EReference getTableEditorConfiguration_VerticalAxisProvider() {

-		return (EReference)tableEditorConfigurationEClass.getEStructuralFeatures().get(0);

+	public EReference getAbstractTableConfiguration_RowAxisProvider() {

+		return (EReference)abstractTableConfigurationEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

@@ -170,8 +189,8 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EReference getTableEditorConfiguration_HorizontalAxisProvider() {

-		return (EReference)tableEditorConfigurationEClass.getEStructuralFeatures().get(1);

+	public EReference getAbstractTableConfiguration_ColumnAxisProvider() {

+		return (EReference)abstractTableConfigurationEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

@@ -179,8 +198,8 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getTableEditorConfiguration_EditorDeclaration() {

-		return (EAttribute)tableEditorConfigurationEClass.getEStructuralFeatures().get(2);

+	public EAttribute getAbstractTableConfiguration_EditorDeclaration() {

+		return (EAttribute)abstractTableConfigurationEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

@@ -188,8 +207,8 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getTableEditorConfiguration_Type() {

-		return (EAttribute)tableEditorConfigurationEClass.getEStructuralFeatures().get(3);

+	public EAttribute getAbstractTableConfiguration_Name() {

+		return (EAttribute)abstractTableConfigurationEClass.getEStructuralFeatures().get(3);

 	}

 

 	/**

@@ -197,8 +216,8 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EClass getAbstractTableConfiguration() {

-		return abstractTableConfigurationEClass;

+	public EAttribute getAbstractTableConfiguration_Description() {

+		return (EAttribute)abstractTableConfigurationEClass.getEStructuralFeatures().get(4);

 	}

 

 	/**

@@ -206,8 +225,8 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EReference getAbstractTableConfiguration_RowAxisProvider() {

-		return (EReference)abstractTableConfigurationEClass.getEStructuralFeatures().get(0);

+	public EClass getTableConfiguration() {

+		return tableConfigurationEClass;

 	}

 

 	/**

@@ -215,8 +234,8 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EReference getAbstractTableConfiguration_ColumnAxisProvider() {

-		return (EReference)abstractTableConfigurationEClass.getEStructuralFeatures().get(1);

+	public EAttribute getTableConfiguration_Type() {

+		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

@@ -224,8 +243,8 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getAbstractTableConfiguration_EditorDeclaration() {

-		return (EAttribute)abstractTableConfigurationEClass.getEStructuralFeatures().get(2);

+	public EAttribute getTableConfiguration_IconPath() {

+		return (EAttribute)tableConfigurationEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

@@ -233,8 +252,8 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getAbstractTableConfiguration_Name() {

-		return (EAttribute)abstractTableConfigurationEClass.getEStructuralFeatures().get(3);

+	public EReference getTableConfiguration_CreationTester() {

+		return (EReference)tableConfigurationEClass.getEStructuralFeatures().get(2);

 	}

 

 	/**

@@ -242,8 +261,35 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getAbstractTableConfiguration_Description() {

-		return (EAttribute)abstractTableConfigurationEClass.getEStructuralFeatures().get(4);

+	public EClass getAbstractTableCreationTester() {

+		return abstractTableCreationTesterEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EOperation getAbstractTableCreationTester__GetTester() {

+		return abstractTableCreationTesterEClass.getEOperations().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getJavaTableCreationTester() {

+		return javaTableCreationTesterEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getJavaTableCreationTester_Tester() {

+		return (EAttribute)javaTableCreationTesterEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

@@ -283,12 +329,6 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 		isCreated = true;

 

 		// Create classes and their features

-		tableEditorConfigurationEClass = createEClass(TABLE_EDITOR_CONFIGURATION);

-		createEReference(tableEditorConfigurationEClass, TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER);

-		createEReference(tableEditorConfigurationEClass, TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER);

-		createEAttribute(tableEditorConfigurationEClass, TABLE_EDITOR_CONFIGURATION__EDITOR_DECLARATION);

-		createEAttribute(tableEditorConfigurationEClass, TABLE_EDITOR_CONFIGURATION__TYPE);

-

 		abstractTableConfigurationEClass = createEClass(ABSTRACT_TABLE_CONFIGURATION);

 		createEReference(abstractTableConfigurationEClass, ABSTRACT_TABLE_CONFIGURATION__ROW_AXIS_PROVIDER);

 		createEReference(abstractTableConfigurationEClass, ABSTRACT_TABLE_CONFIGURATION__COLUMN_AXIS_PROVIDER);

@@ -296,6 +336,17 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 		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);

+

+		abstractTableCreationTesterEClass = createEClass(ABSTRACT_TABLE_CREATION_TESTER);

+		createEOperation(abstractTableCreationTesterEClass, ABSTRACT_TABLE_CREATION_TESTER___GET_TESTER);

+

+		javaTableCreationTesterEClass = createEClass(JAVA_TABLE_CREATION_TESTER);

+		createEAttribute(javaTableCreationTesterEClass, JAVA_TABLE_CREATION_TESTER__TESTER);

+

 		// Create enums

 		cellEditorDeclarationEEnum = createEEnum(CELL_EDITOR_DECLARATION);

 	}

@@ -332,23 +383,30 @@ public class NattableconfigurationPackageImpl extends EPackageImpl implements Na
 		// Set bounds for type parameters

 

 		// Add supertypes to classes

-		tableEditorConfigurationEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

 		abstractTableConfigurationEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

+		tableConfigurationEClass.getESuperTypes().add(this.getAbstractTableConfiguration());

+		javaTableCreationTesterEClass.getESuperTypes().add(this.getAbstractTableCreationTester());

 

 		// Initialize classes, features, and operations; add parameters

-		initEClass(tableEditorConfigurationEClass, TableEditorConfiguration.class, "TableEditorConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getTableEditorConfiguration_VerticalAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "verticalAxisProvider", null, 1, 1, TableEditorConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTableEditorConfiguration_HorizontalAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "horizontalAxisProvider", null, 1, 1, TableEditorConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getTableEditorConfiguration_EditorDeclaration(), this.getCellEditorDeclaration(), "editorDeclaration", "COLUMN", 1, 1, TableEditorConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getTableEditorConfiguration_Type(), ecorePackage.getEString(), "type", null, 1, 1, TableEditorConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

 		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_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(), this.getAbstractTableCreationTester(), 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$

+

+		initEClass(abstractTableCreationTesterEClass, AbstractTableCreationTester.class, "AbstractTableCreationTester", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

+		initEOperation(getAbstractTableCreationTester__GetTester(), ecorePackage.getEJavaObject(), "getTester", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

+

+		initEClass(javaTableCreationTesterEClass, JavaTableCreationTester.class, "JavaTableCreationTester", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+		initEAttribute(getJavaTableCreationTester_Tester(), ecorePackage.getEString(), "tester", null, 1, 1, JavaTableCreationTester.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, 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);

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
new file mode 100644
index 00000000000..95ce06c1a68
--- /dev/null
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
@@ -0,0 +1,305 @@
+/**

+ * 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.AbstractTableCreationTester;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

+

+/**

+ * <!-- 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 AbstractTableCreationTester 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 AbstractTableCreationTester getCreationTester() {

+		return creationTester;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetCreationTester(AbstractTableCreationTester newCreationTester, NotificationChain msgs) {

+		AbstractTableCreationTester 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(AbstractTableCreationTester 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((AbstractTableCreationTester)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((AbstractTableCreationTester)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/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableEditorConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableEditorConfigurationImpl.java
deleted file mode 100644
index 9defe613dd5..00000000000
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableEditorConfigurationImpl.java
+++ /dev/null
@@ -1,372 +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.EModelElementImpl;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Table Editor Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableEditorConfigurationImpl#getVerticalAxisProvider <em>Vertical Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableEditorConfigurationImpl#getHorizontalAxisProvider <em>Horizontal Axis Provider</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableEditorConfigurationImpl#getEditorDeclaration <em>Editor Declaration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableEditorConfigurationImpl#getType <em>Type</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class TableEditorConfigurationImpl extends EModelElementImpl implements TableEditorConfiguration {

-	/**

-	 * The cached value of the '{@link #getVerticalAxisProvider() <em>Vertical Axis Provider</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getVerticalAxisProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected AbstractAxisProvider verticalAxisProvider;

-

-	/**

-	 * The cached value of the '{@link #getHorizontalAxisProvider() <em>Horizontal Axis Provider</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getHorizontalAxisProvider()

-	 * @generated

-	 * @ordered

-	 */

-	protected AbstractAxisProvider horizontalAxisProvider;

-

-	/**

-	 * 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 #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;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected TableEditorConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableconfigurationPackage.Literals.TABLE_EDITOR_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AbstractAxisProvider getVerticalAxisProvider() {

-		return verticalAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetVerticalAxisProvider(AbstractAxisProvider newVerticalAxisProvider, NotificationChain msgs) {

-		AbstractAxisProvider oldVerticalAxisProvider = verticalAxisProvider;

-		verticalAxisProvider = newVerticalAxisProvider;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER, oldVerticalAxisProvider, newVerticalAxisProvider);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setVerticalAxisProvider(AbstractAxisProvider newVerticalAxisProvider) {

-		if (newVerticalAxisProvider != verticalAxisProvider) {

-			NotificationChain msgs = null;

-			if (verticalAxisProvider != null)

-				msgs = ((InternalEObject)verticalAxisProvider).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER, null, msgs);

-			if (newVerticalAxisProvider != null)

-				msgs = ((InternalEObject)newVerticalAxisProvider).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER, null, msgs);

-			msgs = basicSetVerticalAxisProvider(newVerticalAxisProvider, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER, newVerticalAxisProvider, newVerticalAxisProvider));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AbstractAxisProvider getHorizontalAxisProvider() {

-		return horizontalAxisProvider;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetHorizontalAxisProvider(AbstractAxisProvider newHorizontalAxisProvider, NotificationChain msgs) {

-		AbstractAxisProvider oldHorizontalAxisProvider = horizontalAxisProvider;

-		horizontalAxisProvider = newHorizontalAxisProvider;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER, oldHorizontalAxisProvider, newHorizontalAxisProvider);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setHorizontalAxisProvider(AbstractAxisProvider newHorizontalAxisProvider) {

-		if (newHorizontalAxisProvider != horizontalAxisProvider) {

-			NotificationChain msgs = null;

-			if (horizontalAxisProvider != null)

-				msgs = ((InternalEObject)horizontalAxisProvider).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER, null, msgs);

-			if (newHorizontalAxisProvider != null)

-				msgs = ((InternalEObject)newHorizontalAxisProvider).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER, null, msgs);

-			msgs = basicSetHorizontalAxisProvider(newHorizontalAxisProvider, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER, newHorizontalAxisProvider, newHorizontalAxisProvider));

-	}

-

-	/**

-	 * <!-- 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.TABLE_EDITOR_CONFIGURATION__EDITOR_DECLARATION, oldEditorDeclaration, editorDeclaration));

-	}

-

-	/**

-	 * <!-- 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_EDITOR_CONFIGURATION__TYPE, oldType, type));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER:

-				return basicSetVerticalAxisProvider(null, msgs);

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER:

-				return basicSetHorizontalAxisProvider(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_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER:

-				return getVerticalAxisProvider();

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER:

-				return getHorizontalAxisProvider();

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__EDITOR_DECLARATION:

-				return getEditorDeclaration();

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__TYPE:

-				return getType();

-		}

-		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_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER:

-				setVerticalAxisProvider((AbstractAxisProvider)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER:

-				setHorizontalAxisProvider((AbstractAxisProvider)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__EDITOR_DECLARATION:

-				setEditorDeclaration((CellEditorDeclaration)newValue);

-				return;

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__TYPE:

-				setType((String)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER:

-				setVerticalAxisProvider((AbstractAxisProvider)null);

-				return;

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER:

-				setHorizontalAxisProvider((AbstractAxisProvider)null);

-				return;

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__EDITOR_DECLARATION:

-				setEditorDeclaration(EDITOR_DECLARATION_EDEFAULT);

-				return;

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__TYPE:

-				setType(TYPE_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__VERTICAL_AXIS_PROVIDER:

-				return verticalAxisProvider != null;

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__HORIZONTAL_AXIS_PROVIDER:

-				return horizontalAxisProvider != null;

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__EDITOR_DECLARATION:

-				return editorDeclaration != EDITOR_DECLARATION_EDEFAULT;

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION__TYPE:

-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);

-		}

-		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(", type: "); //$NON-NLS-1$

-		result.append(type);

-		result.append(')');

-		return result.toString();

-	}

-

-} //TableEditorConfigurationImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
index ce8e8441b90..faa6f60ea4f 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
@@ -79,14 +79,22 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
 	protected NattableconfigurationSwitch<Adapter> modelSwitch =

 		new NattableconfigurationSwitch<Adapter>() {

 			@Override

-			public Adapter caseTableEditorConfiguration(TableEditorConfiguration object) {

-				return createTableEditorConfigurationAdapter();

-			}

-			@Override

 			public Adapter caseAbstractTableConfiguration(AbstractTableConfiguration object) {

 				return createAbstractTableConfigurationAdapter();

 			}

 			@Override

+			public Adapter caseTableConfiguration(TableConfiguration object) {

+				return createTableConfigurationAdapter();

+			}

+			@Override

+			public Adapter caseAbstractTableCreationTester(AbstractTableCreationTester object) {

+				return createAbstractTableCreationTesterAdapter();

+			}

+			@Override

+			public Adapter caseJavaTableCreationTester(JavaTableCreationTester object) {

+				return createJavaTableCreationTesterAdapter();

+			}

+			@Override

 			public Adapter caseEModelElement(EModelElement object) {

 				return createEModelElementAdapter();

 			}

@@ -111,30 +119,58 @@ public class NattableconfigurationAdapterFactory extends AdapterFactoryImpl {
 

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration <em>Table Editor Configuration</em>}'.

+	 * 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.TableEditorConfiguration

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableConfiguration

 	 * @generated

 	 */

-	public Adapter createTableEditorConfigurationAdapter() {

+	public Adapter createAbstractTableConfigurationAdapter() {

 		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>}'.

+	 * 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.AbstractTableConfiguration

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration

 	 * @generated

 	 */

-	public Adapter createAbstractTableConfigurationAdapter() {

+	public Adapter createTableConfigurationAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.AbstractTableCreationTester <em>Abstract Table Creation 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.nattableconfiguration.AbstractTableCreationTester

+	 * @generated

+	 */

+	public Adapter createAbstractTableCreationTesterAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.JavaTableCreationTester <em>Java Table Creation 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.nattableconfiguration.JavaTableCreationTester

+	 * @generated

+	 */

+	public Adapter createJavaTableCreationTesterAdapter() {

 		return null;

 	}

 

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
index 2d0c6564db2..c8638cf15f8 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
@@ -77,13 +77,6 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

 		switch (classifierID) {

-			case NattableconfigurationPackage.TABLE_EDITOR_CONFIGURATION: {

-				TableEditorConfiguration tableEditorConfiguration = (TableEditorConfiguration)theEObject;

-				T result = caseTableEditorConfiguration(tableEditorConfiguration);

-				if (result == null) result = caseEModelElement(tableEditorConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

 			case NattableconfigurationPackage.ABSTRACT_TABLE_CONFIGURATION: {

 				AbstractTableConfiguration abstractTableConfiguration = (AbstractTableConfiguration)theEObject;

 				T result = caseAbstractTableConfiguration(abstractTableConfiguration);

@@ -91,37 +84,88 @@ public class NattableconfigurationSwitch<T> extends Switch<T> {
 				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 = caseEModelElement(tableConfiguration);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableconfigurationPackage.ABSTRACT_TABLE_CREATION_TESTER: {

+				AbstractTableCreationTester abstractTableCreationTester = (AbstractTableCreationTester)theEObject;

+				T result = caseAbstractTableCreationTester(abstractTableCreationTester);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case NattableconfigurationPackage.JAVA_TABLE_CREATION_TESTER: {

+				JavaTableCreationTester javaTableCreationTester = (JavaTableCreationTester)theEObject;

+				T result = caseJavaTableCreationTester(javaTableCreationTester);

+				if (result == null) result = caseAbstractTableCreationTester(javaTableCreationTester);

+				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 Editor Configuration</em>'.

+	 * 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>Table Editor Configuration</em>'.

+	 * @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 caseTableEditorConfiguration(TableEditorConfiguration object) {

+	public T caseAbstractTableConfiguration(AbstractTableConfiguration object) {

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Table Configuration</em>'.

+	 * 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>Abstract Table Configuration</em>'.

+	 * @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 caseAbstractTableConfiguration(AbstractTableConfiguration object) {

+	public T caseTableConfiguration(TableConfiguration object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Table Creation 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 Creation Tester</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseAbstractTableCreationTester(AbstractTableCreationTester object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Java Table Creation 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 Creation Tester</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseJavaTableCreationTester(JavaTableCreationTester object) {

 		return null;

 	}

 

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
index facc2d14df8..582c6d88cb9 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
@@ -32,7 +32,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
  * @model

  * @generated

  */

-public interface FeatureLabelProviderConfiguration extends EObjectLabelProviderConfiguration {

+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>.

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
index 0949c76772b..b3b96be8f3c 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
@@ -41,13 +41,13 @@ public interface NattablelabelproviderFactory extends EFactory {
 	FeatureLabelProviderConfiguration createFeatureLabelProviderConfiguration();

 

 	/**

-	 * Returns a new object of class '<em>EObject Label Provider Configuration</em>'.

+	 * 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>EObject Label Provider Configuration</em>'.

+	 * @return a new object of class '<em>Object Label Provider Configuration</em>'.

 	 * @generated

 	 */

-	EObjectLabelProviderConfiguration createEObjectLabelProviderConfiguration();

+	ObjectLabelProviderConfiguration createObjectLabelProviderConfiguration();

 

 	/**

 	 * Returns the package supported by this factory.

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
index 3a99ee13905..e7475219bd6 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
@@ -122,24 +122,14 @@ public interface NattablelabelproviderPackage extends EPackage {
 	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.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 meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.EObjectLabelProviderConfigurationImpl <em>EObject Label Provider Configuration</em>}' class.

+	 * 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.EObjectLabelProviderConfigurationImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getEObjectLabelProviderConfiguration()

+	 * @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 EOBJECT_LABEL_PROVIDER_CONFIGURATION = 2;

+	int OBJECT_LABEL_PROVIDER_CONFIGURATION = 2;

 

 	/**

 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

@@ -148,7 +138,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int EOBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = ILABEL_CONFIGURATION__EANNOTATIONS;

+	int OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = ILABEL_CONFIGURATION__EANNOTATIONS;

 

 	/**

 	 * The feature id for the '<em><b>Label Provider Context</b></em>' attribute.

@@ -157,7 +147,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int EOBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT = ILABEL_CONFIGURATION__LABEL_PROVIDER_CONTEXT;

+	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.

@@ -166,7 +156,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = ILABEL_CONFIGURATION_FEATURE_COUNT + 0;

+	int OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = ILABEL_CONFIGURATION_FEATURE_COUNT + 0;

 

 	/**

 	 * The feature id for the '<em><b>Display Label</b></em>' attribute.

@@ -175,16 +165,16 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = ILABEL_CONFIGURATION_FEATURE_COUNT + 1;

+	int OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = ILABEL_CONFIGURATION_FEATURE_COUNT + 1;

 

 	/**

-	 * The number of structural features of the '<em>EObject Label Provider Configuration</em>' class.

+	 * The number of structural features of the '<em>Object Label Provider Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int EOBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = ILABEL_CONFIGURATION_FEATURE_COUNT + 2;

+	int OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = ILABEL_CONFIGURATION_FEATURE_COUNT + 2;

 

 	/**

 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

@@ -193,16 +183,26 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int EOBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = ILABEL_CONFIGURATION___GET_EANNOTATION__STRING;

+	int OBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = ILABEL_CONFIGURATION___GET_EANNOTATION__STRING;

 

 	/**

-	 * The number of operations of the '<em>EObject Label Provider Configuration</em>' class.

+	 * The number of operations of the '<em>Object Label Provider Configuration</em>' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @generated

 	 * @ordered

 	 */

-	int EOBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = ILABEL_CONFIGURATION_OPERATION_COUNT + 0;

+	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.

@@ -211,7 +211,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = EOBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS;

+	int FEATURE_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS = OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS;

 

 	/**

 	 * The feature id for the '<em><b>Label Provider Context</b></em>' attribute.

@@ -220,7 +220,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT = EOBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT;

+	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.

@@ -229,7 +229,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON;

+	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.

@@ -238,7 +238,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL;

+	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.

@@ -247,7 +247,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_IS_DERIVED = EOBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 0;

+	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.

@@ -256,7 +256,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_TYPE = EOBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 1;

+	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.

@@ -265,7 +265,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY = EOBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 2;

+	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.

@@ -274,7 +274,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME = EOBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 3;

+	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.

@@ -283,7 +283,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = EOBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 4;

+	int FEATURE_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_FEATURE_COUNT + 4;

 

 	/**

 	 * The operation id for the '<em>Get EAnnotation</em>' operation.

@@ -292,7 +292,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING = EOBJECT_LABEL_PROVIDER_CONFIGURATION___GET_EANNOTATION__STRING;

+	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.

@@ -301,7 +301,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 	 * @generated

 	 * @ordered

 	 */

-	int FEATURE_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = EOBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT + 0;

+	int FEATURE_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT = OBJECT_LABEL_PROVIDER_CONFIGURATION_OPERATION_COUNT + 0;

 

 

 	/**

@@ -380,36 +380,36 @@ public interface NattablelabelproviderPackage extends EPackage {
 	EAttribute getFeatureLabelProviderConfiguration_DisplayName();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration <em>EObject Label Provider Configuration</em>}'.

+	 * 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>EObject Label Provider Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration

+	 * @return the meta object for class '<em>Object Label Provider Configuration</em>'.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration

 	 * @generated

 	 */

-	EClass getEObjectLabelProviderConfiguration();

+	EClass getObjectLabelProviderConfiguration();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}'.

+	 * 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.EObjectLabelProviderConfiguration#isDisplayIcon()

-	 * @see #getEObjectLabelProviderConfiguration()

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon()

+	 * @see #getObjectLabelProviderConfiguration()

 	 * @generated

 	 */

-	EAttribute getEObjectLabelProviderConfiguration_DisplayIcon();

+	EAttribute getObjectLabelProviderConfiguration_DisplayIcon();

 

 	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}'.

+	 * 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.EObjectLabelProviderConfiguration#isDisplayLabel()

-	 * @see #getEObjectLabelProviderConfiguration()

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel()

+	 * @see #getObjectLabelProviderConfiguration()

 	 * @generated

 	 */

-	EAttribute getEObjectLabelProviderConfiguration_DisplayLabel();

+	EAttribute getObjectLabelProviderConfiguration_DisplayLabel();

 

 	/**

 	 * Returns the factory that creates the instances of the model.

@@ -495,14 +495,14 @@ public interface NattablelabelproviderPackage extends EPackage {
 		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.EObjectLabelProviderConfigurationImpl <em>EObject Label Provider Configuration</em>}' class.

+		 * 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.EObjectLabelProviderConfigurationImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl#getEObjectLabelProviderConfiguration()

+		 * @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 EOBJECT_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getEObjectLabelProviderConfiguration();

+		EClass OBJECT_LABEL_PROVIDER_CONFIGURATION = eINSTANCE.getObjectLabelProviderConfiguration();

 

 		/**

 		 * The meta object literal for the '<em><b>Display Icon</b></em>' attribute feature.

@@ -510,7 +510,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EAttribute EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = eINSTANCE.getEObjectLabelProviderConfiguration_DisplayIcon();

+		EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON = eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();

 

 		/**

 		 * The meta object literal for the '<em><b>Display Label</b></em>' attribute feature.

@@ -518,7 +518,7 @@ public interface NattablelabelproviderPackage extends EPackage {
 		 * <!-- end-user-doc -->

 		 * @generated

 		 */

-		EAttribute EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = eINSTANCE.getEObjectLabelProviderConfiguration_DisplayLabel();

+		EAttribute OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL = eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();

 

 	}

 

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/EObjectLabelProviderConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
index d535cd5431e..8502636bcb8 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/EObjectLabelProviderConfiguration.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
@@ -15,22 +15,22 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;
 

 /**

  * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EObject Label Provider Configuration</b></em>'.

+ * 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.EObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}</li>

+ *   <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#getEObjectLabelProviderConfiguration()

+ * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration()

  * @model

  * @generated

  */

-public interface EObjectLabelProviderConfiguration extends ILabelConfiguration {

+public interface ObjectLabelProviderConfiguration extends ILabelConfiguration {

 	/**

 	 * Returns the value of the '<em><b>Display Icon</b></em>' attribute.

 	 * The default value is <code>"true"</code>.

@@ -42,14 +42,14 @@ public interface EObjectLabelProviderConfiguration extends ILabelConfiguration {
 	 * <!-- 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#getEObjectLabelProviderConfiguration_DisplayIcon()

+	 * @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.EObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}' attribute.

+	 * 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.

@@ -69,14 +69,14 @@ public interface EObjectLabelProviderConfiguration extends ILabelConfiguration {
 	 * <!-- 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#getEObjectLabelProviderConfiguration_DisplayLabel()

+	 * @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.EObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}' attribute.

+	 * 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.

@@ -85,4 +85,4 @@ public interface EObjectLabelProviderConfiguration extends ILabelConfiguration {
 	 */

 	void setDisplayLabel(boolean value);

 

-} // EObjectLabelProviderConfiguration

+} // ObjectLabelProviderConfiguration

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
index 4cb790bc4da..6c465baa207 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
@@ -13,8 +13,11 @@
 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;

 

@@ -35,7 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.N
  * @generated

  */

 public class FeatureLabelProviderConfigurationImpl extends 

-EObjectLabelProviderConfigurationImpl implements FeatureLabelProviderConfiguration {

+ObjectLabelProviderConfigurationImpl implements FeatureLabelProviderConfiguration {

 	/**

 	 * The default value of the '{@link #isDisplayIsDerived() <em>Display Is Derived</em>}' attribute.

 	 * <!-- begin-user-doc -->

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
index 2a8b8faac8a..fedca1b6480 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
@@ -67,7 +67,7 @@ public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements Na
 	public EObject create(EClass eClass) {

 		switch (eClass.getClassifierID()) {

 			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION: return createFeatureLabelProviderConfiguration();

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION: return createEObjectLabelProviderConfiguration();

+			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$

 		}

@@ -88,9 +88,9 @@ public class NattablelabelproviderFactoryImpl extends EFactoryImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EObjectLabelProviderConfiguration createEObjectLabelProviderConfiguration() {

-		EObjectLabelProviderConfigurationImpl eObjectLabelProviderConfiguration = new EObjectLabelProviderConfigurationImpl();

-		return eObjectLabelProviderConfiguration;

+	public ObjectLabelProviderConfiguration createObjectLabelProviderConfiguration() {

+		ObjectLabelProviderConfigurationImpl objectLabelProviderConfiguration = new ObjectLabelProviderConfigurationImpl();

+		return objectLabelProviderConfiguration;

 	}

 

 	/**

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
index 2e459119e56..8553afd92cf 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
@@ -16,28 +16,20 @@ 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.EObjectLabelProviderConfiguration;

 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;

 

 /**

  * <!-- begin-user-doc -->

@@ -65,7 +57,7 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	private EClass eObjectLabelProviderConfigurationEClass = null;

+	private EClass objectLabelProviderConfigurationEClass = null;

 

 	/**

 	 * Creates an instance of the model <b>Package</b>, registered with

@@ -213,8 +205,8 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EClass getEObjectLabelProviderConfiguration() {

-		return eObjectLabelProviderConfigurationEClass;

+	public EClass getObjectLabelProviderConfiguration() {

+		return objectLabelProviderConfigurationEClass;

 	}

 

 	/**

@@ -222,8 +214,8 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getEObjectLabelProviderConfiguration_DisplayIcon() {

-		return (EAttribute)eObjectLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);

+	public EAttribute getObjectLabelProviderConfiguration_DisplayIcon() {

+		return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(0);

 	}

 

 	/**

@@ -231,8 +223,8 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EAttribute getEObjectLabelProviderConfiguration_DisplayLabel() {

-		return (EAttribute)eObjectLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);

+	public EAttribute getObjectLabelProviderConfiguration_DisplayLabel() {

+		return (EAttribute)objectLabelProviderConfigurationEClass.getEStructuralFeatures().get(1);

 	}

 

 	/**

@@ -272,9 +264,9 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_MULTIPLICITY);

 		createEAttribute(featureLabelProviderConfigurationEClass, FEATURE_LABEL_PROVIDER_CONFIGURATION__DISPLAY_NAME);

 

-		eObjectLabelProviderConfigurationEClass = createEClass(EOBJECT_LABEL_PROVIDER_CONFIGURATION);

-		createEAttribute(eObjectLabelProviderConfigurationEClass, EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON);

-		createEAttribute(eObjectLabelProviderConfigurationEClass, EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL);

+		objectLabelProviderConfigurationEClass = createEClass(OBJECT_LABEL_PROVIDER_CONFIGURATION);

+		createEAttribute(objectLabelProviderConfigurationEClass, OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON);

+		createEAttribute(objectLabelProviderConfigurationEClass, OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL);

 	}

 

 	/**

@@ -309,8 +301,8 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 

 		// Add supertypes to classes

 		iLabelConfigurationEClass.getESuperTypes().add(theEcorePackage.getEModelElement());

-		featureLabelProviderConfigurationEClass.getESuperTypes().add(this.getEObjectLabelProviderConfiguration());

-		eObjectLabelProviderConfigurationEClass.getESuperTypes().add(this.getILabelConfiguration());

+		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$

@@ -322,9 +314,9 @@ public class NattablelabelproviderPackageImpl extends EPackageImpl implements Na
 		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(eObjectLabelProviderConfigurationEClass, EObjectLabelProviderConfiguration.class, "EObjectLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getEObjectLabelProviderConfiguration_DisplayIcon(), theEcorePackage.getEBoolean(), "displayIcon", "true", 1, 1, EObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getEObjectLabelProviderConfiguration_DisplayLabel(), theEcorePackage.getEBoolean(), "displayLabel", "true", 1, 1, EObjectLabelProviderConfiguration.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/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/EObjectLabelProviderConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
index 1c503bbe7ff..3475cf02d35 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/EObjectLabelProviderConfigurationImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
@@ -19,25 +19,25 @@ 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.EObjectLabelProviderConfiguration;

 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>EObject Label Provider Configuration</b></em>'.

+ * 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.EObjectLabelProviderConfigurationImpl#getLabelProviderContext <em>Label Provider Context</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.EObjectLabelProviderConfigurationImpl#isDisplayIcon <em>Display Icon</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.EObjectLabelProviderConfigurationImpl#isDisplayLabel <em>Display Label</em>}</li>

+ *   <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 EObjectLabelProviderConfigurationImpl extends EModelElementImpl implements EObjectLabelProviderConfiguration {

+public class ObjectLabelProviderConfigurationImpl extends EModelElementImpl implements ObjectLabelProviderConfiguration {

 	/**

 	 * The default value of the '{@link #getLabelProviderContext() <em>Label Provider Context</em>}' attribute.

 	 * <!-- begin-user-doc -->

@@ -103,7 +103,7 @@ public class EObjectLabelProviderConfigurationImpl extends EModelElementImpl imp
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	protected EObjectLabelProviderConfigurationImpl() {

+	protected ObjectLabelProviderConfigurationImpl() {

 		super();

 	}

 

@@ -114,7 +114,7 @@ public class EObjectLabelProviderConfigurationImpl extends EModelElementImpl imp
 	 */

 	@Override

 	protected EClass eStaticClass() {

-		return NattablelabelproviderPackage.Literals.EOBJECT_LABEL_PROVIDER_CONFIGURATION;

+		return NattablelabelproviderPackage.Literals.OBJECT_LABEL_PROVIDER_CONFIGURATION;

 	}

 

 	/**

@@ -135,7 +135,7 @@ public class EObjectLabelProviderConfigurationImpl extends EModelElementImpl imp
 		String oldLabelProviderContext = labelProviderContext;

 		labelProviderContext = newLabelProviderContext;

 		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT, oldLabelProviderContext, labelProviderContext));

+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT, oldLabelProviderContext, labelProviderContext));

 	}

 

 	/**

@@ -156,7 +156,7 @@ public class EObjectLabelProviderConfigurationImpl extends EModelElementImpl imp
 		boolean oldDisplayIcon = displayIcon;

 		displayIcon = newDisplayIcon;

 		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON, oldDisplayIcon, displayIcon));

+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON, oldDisplayIcon, displayIcon));

 	}

 

 	/**

@@ -177,7 +177,7 @@ public class EObjectLabelProviderConfigurationImpl extends EModelElementImpl imp
 		boolean oldDisplayLabel = displayLabel;

 		displayLabel = newDisplayLabel;

 		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL, oldDisplayLabel, displayLabel));

+			eNotify(new ENotificationImpl(this, Notification.SET, NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL, oldDisplayLabel, displayLabel));

 	}

 

 	/**

@@ -188,11 +188,11 @@ public class EObjectLabelProviderConfigurationImpl extends EModelElementImpl imp
 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch (featureID) {

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

 				return getLabelProviderContext();

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

 				return isDisplayIcon();

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

 				return isDisplayLabel();

 		}

 		return super.eGet(featureID, resolve, coreType);

@@ -206,13 +206,13 @@ public class EObjectLabelProviderConfigurationImpl extends EModelElementImpl imp
 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch (featureID) {

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

 				setLabelProviderContext((String)newValue);

 				return;

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

 				setDisplayIcon((Boolean)newValue);

 				return;

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

 				setDisplayLabel((Boolean)newValue);

 				return;

 		}

@@ -227,13 +227,13 @@ public class EObjectLabelProviderConfigurationImpl extends EModelElementImpl imp
 	@Override

 	public void eUnset(int featureID) {

 		switch (featureID) {

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

 				setLabelProviderContext(LABEL_PROVIDER_CONTEXT_EDEFAULT);

 				return;

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

 				setDisplayIcon(DISPLAY_ICON_EDEFAULT);

 				return;

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

 				setDisplayLabel(DISPLAY_LABEL_EDEFAULT);

 				return;

 		}

@@ -248,11 +248,11 @@ public class EObjectLabelProviderConfigurationImpl extends EModelElementImpl imp
 	@Override

 	public boolean eIsSet(int featureID) {

 		switch (featureID) {

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__LABEL_PROVIDER_CONTEXT:

+			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.EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_ICON:

 				return displayIcon != DISPLAY_ICON_EDEFAULT;

-			case NattablelabelproviderPackage.EOBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

+			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__DISPLAY_LABEL:

 				return displayLabel != DISPLAY_LABEL_EDEFAULT;

 		}

 		return super.eIsSet(featureID);

@@ -278,4 +278,4 @@ public class EObjectLabelProviderConfigurationImpl extends EModelElementImpl imp
 		return result.toString();

 	}

 

-} //EObjectLabelProviderConfigurationImpl

+} //ObjectLabelProviderConfigurationImpl

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
index a940ff427a9..a60673e5eda 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
@@ -87,8 +87,8 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
 				return createFeatureLabelProviderConfigurationAdapter();

 			}

 			@Override

-			public Adapter caseEObjectLabelProviderConfiguration(EObjectLabelProviderConfiguration object) {

-				return createEObjectLabelProviderConfigurationAdapter();

+			public Adapter caseObjectLabelProviderConfiguration(ObjectLabelProviderConfiguration object) {

+				return createObjectLabelProviderConfigurationAdapter();

 			}

 			@Override

 			public Adapter caseEModelElement(EModelElement object) {

@@ -143,16 +143,16 @@ public class NattablelabelproviderAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration <em>EObject Label Provider Configuration</em>}'.

+	 * 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.EObjectLabelProviderConfiguration

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration

 	 * @generated

 	 */

-	public Adapter createEObjectLabelProviderConfigurationAdapter() {

+	public Adapter createObjectLabelProviderConfigurationAdapter() {

 		return null;

 	}

 

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
index efdeb0efa2c..948e2b92372 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
@@ -87,17 +87,17 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
 			case NattablelabelproviderPackage.FEATURE_LABEL_PROVIDER_CONFIGURATION: {

 				FeatureLabelProviderConfiguration featureLabelProviderConfiguration = (FeatureLabelProviderConfiguration)theEObject;

 				T result = caseFeatureLabelProviderConfiguration(featureLabelProviderConfiguration);

-				if (result == null) result = caseEObjectLabelProviderConfiguration(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.EOBJECT_LABEL_PROVIDER_CONFIGURATION: {

-				EObjectLabelProviderConfiguration eObjectLabelProviderConfiguration = (EObjectLabelProviderConfiguration)theEObject;

-				T result = caseEObjectLabelProviderConfiguration(eObjectLabelProviderConfiguration);

-				if (result == null) result = caseILabelConfiguration(eObjectLabelProviderConfiguration);

-				if (result == null) result = caseEModelElement(eObjectLabelProviderConfiguration);

+			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;

 			}

@@ -136,17 +136,17 @@ public class NattablelabelproviderSwitch<T> extends Switch<T> {
 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject Label Provider Configuration</em>'.

+	 * 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>EObject Label Provider Configuration</em>'.

+	 * @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 caseEObjectLabelProviderConfiguration(EObjectLabelProviderConfiguration object) {

+	public T caseObjectLabelProviderConfiguration(ObjectLabelProviderConfiguration object) {

 		return null;

 	}

 

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
index 890259e4426..7fc7f1853f8 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
@@ -22,6 +22,8 @@ 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.

@@ -83,10 +85,6 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
 				return createTableAdapter();

 			}

 			@Override

-			public Adapter caseEObjectAxis(EObjectAxis object) {

-				return createEObjectAxisAdapter();

-			}

-			@Override

 			public Adapter caseIAxis(IAxis object) {

 				return createIAxisAdapter();

 			}

@@ -95,10 +93,18 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
 				return createIdAxisAdapter();

 			}

 			@Override

+			public Adapter caseEObjectAxis(EObjectAxis object) {

+				return createEObjectAxisAdapter();

+			}

+			@Override

 			public Adapter caseEModelElement(EModelElement object) {

 				return createEModelElementAdapter();

 			}

 			@Override

+			public Adapter caseAbstractTableConfiguration(AbstractTableConfiguration object) {

+				return createAbstractTableConfigurationAdapter();

+			}

+			@Override

 			public Adapter defaultCase(EObject object) {

 				return createEObjectAdapter();

 			}

@@ -133,44 +139,44 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis <em>EObject Axis</em>}'.

+	 * 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.EObjectAxis

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.IAxis

 	 * @generated

 	 */

-	public Adapter createEObjectAxisAdapter() {

+	public Adapter createIAxisAdapter() {

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.IAxis <em>IAxis</em>}'.

+	 * 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.IAxis

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis

 	 * @generated

 	 */

-	public Adapter createIAxisAdapter() {

+	public Adapter createIdAxisAdapter() {

 		return null;

 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.IdAxis <em>Id Axis</em>}'.

+	 * 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.IdAxis

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.EObjectAxis

 	 * @generated

 	 */

-	public Adapter createIdAxisAdapter() {

+	public Adapter createEObjectAxisAdapter() {

 		return null;

 	}

 

@@ -189,6 +195,20 @@ public class NattableAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

+	 * 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.

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
index d2f97961a5e..554c6a7a3f1 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
@@ -20,6 +20,8 @@ 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.

@@ -80,18 +82,11 @@ public class NattableSwitch<T> extends Switch<T> {
 			case NattablePackage.TABLE: {

 				Table table = (Table)theEObject;

 				T result = caseTable(table);

+				if (result == null) result = caseAbstractTableConfiguration(table);

 				if (result == null) result = caseEModelElement(table);

 				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;

-			}

 			case NattablePackage.IAXIS: {

 				IAxis iAxis = (IAxis)theEObject;

 				T result = caseIAxis(iAxis);

@@ -107,6 +102,14 @@ public class NattableSwitch<T> extends Switch<T> {
 				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);

 		}

 	}

@@ -127,47 +130,47 @@ public class NattableSwitch<T> extends Switch<T> {
 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject Axis</em>'.

+	 * 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>EObject Axis</em>'.

+	 * @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 caseEObjectAxis(EObjectAxis object) {

+	public T caseIAxis(IAxis object) {

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>IAxis</em>'.

+	 * 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>IAxis</em>'.

+	 * @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 caseIAxis(IAxis object) {

+	public T caseIdAxis(IdAxis object) {

 		return null;

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Id Axis</em>'.

+	 * 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>Id Axis</em>'.

+	 * @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 caseIdAxis(IdAxis object) {

+	public T caseEObjectAxis(EObjectAxis object) {

 		return null;

 	}

 

@@ -187,6 +190,21 @@ public class NattableSwitch<T> extends Switch<T> {
 	}

 

 	/**

+	 * 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;

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/resources/viewpage.nattableconfiguration b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/resources/viewpage.nattableconfiguration
index 7d687f72176..da3b4c48135 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/resources/viewpage.nattableconfiguration
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/resources/viewpage.nattableconfiguration
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<nattableconfiguration:TableEditorConfiguration

+<nattableconfiguration:TableConfiguration

     xmi:version="2.0"

     xmlns:xmi="http://www.omg.org/XMI"

     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

@@ -10,7 +10,7 @@
     xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"

     xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider"

     type="PapyruNattableViewsEditor">

-  <verticalAxisProvider

+  <columnAxisProvider

       xsi:type="nattableaxisprovider:DefaultAxisProvider">

     <javaAxisManagerIds>org.eclipse.papyrus.infra.nattable.page.editor.view.feature.axis.manager</javaAxisManagerIds>

     <axisConfiguration

@@ -28,18 +28,18 @@
         element="nattable_editor_pages:/isOpen"/>

     <axis xsi:type="nattable:IdAxis"

         element="nattable_editor_pages:/type"/>

-  </verticalAxisProvider>

-  <horizontalAxisProvider

+  </columnAxisProvider>

+  <rowAxisProvider

       xsi:type="nattableaxisprovider:EMFFeatureValueAxisProvider">

     <javaAxisManagerIds>org.eclipse.papyrus.infra.nattable.page.editor.contents.axis.manager</javaAxisManagerIds>

     <axisConfiguration

         xsi:type="nattableaxisconfiguration:DefaultAxisConfiguration">

       <labelConfiguration

-          xsi:type="nattablelabelprovider:EObjectLabelProviderConfiguration"

+          xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"

           labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider"/>

     </axisConfiguration>

     <listenFeature

         xsi:type="ecore:EReference"

         href="platform:/plugin/org.eclipse.papyrus.infra.core.sasheditor.di/model/di.ecore#//PageList/availablePage"/>

-  </horizontalAxisProvider>

-</nattableconfiguration:TableEditorConfiguration>

+  </rowAxisProvider>

+</nattableconfiguration:TableConfiguration>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/src/org/eclipse/papyrus/infra/nattable/views/editor/provider/ModelViewsHeaderLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/src/org/eclipse/papyrus/infra/nattable/views/editor/provider/ModelViewsHeaderLabelProvider.java
index db392f67ed4..079bf55dd63 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/src/org/eclipse/papyrus/infra/nattable/views/editor/provider/ModelViewsHeaderLabelProvider.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.views.editor/src/org/eclipse/papyrus/infra/nattable/views/editor/provider/ModelViewsHeaderLabelProvider.java
@@ -21,9 +21,9 @@ import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
 import org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider;

 import org.eclipse.papyrus.infra.emf.nattable.registry.EStructuralFeatureImageRegistry;

 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration;

 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.ObjectLabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

 import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement;

 import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElement;

@@ -97,7 +97,7 @@ public class ModelViewsHeaderLabelProvider extends EMFFeatureHeaderLabelProvider
 				conf = manager.getRowAxisConfiguration().getLabelConfiguration();

 			}

 		}

-		if(conf instanceof EObjectLabelProviderConfiguration && !((EObjectLabelProviderConfiguration)conf).isDisplayLabel()) {

+		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayLabel()) {

 			return "";

 		}

 		if(conf instanceof FeatureLabelProviderConfiguration) {

@@ -128,7 +128,7 @@ public class ModelViewsHeaderLabelProvider extends EMFFeatureHeaderLabelProvider
 			}

 

 		}

-		if(conf instanceof EObjectLabelProviderConfiguration && !((EObjectLabelProviderConfiguration)conf).isDisplayIcon()) {

+		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayIcon()) {

 			return null;

 		}

 		final Object object = ((ILabelProviderContextElement)element).getObject();

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
index 255eb543f69..522ef00ee75 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
@@ -63,7 +63,7 @@ public class EditConfiguration extends DefaultEditConfiguration {
 

 		final BodyLayerStack bodyLayerStack = modelManager.getBodyLayerStack();

 		final Table table = modelManager.getTable();

-		final CellEditorDeclaration editorDeclaration = modelManager.getTable().getEditorConfiguration().getEditorDeclaration();

+		final CellEditorDeclaration editorDeclaration = modelManager.getTable().getEditorDeclaration();

 		if(editorDeclaration.equals(CellEditorDeclaration.COLUMN)) {

 			if(table.isInvertAxis()) {

 				//we declared celleditor on row

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java
index d354710b2c3..9b7cc1b05dc 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java
@@ -32,7 +32,7 @@ public class ColumnDisplayLabelImageHandler extends AbstractColumnChangeLabelCon
 	 */

 	@Override

 	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getEObjectLabelProviderConfiguration_DisplayIcon();

+		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();

 	}

 

 }

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java
index fea5c14897e..f8587b9fd40 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java
@@ -33,7 +33,7 @@ public class ColumnDisplayLabelTextHandler extends AbstractColumnChangeLabelConf
 	 */

 	@Override

 	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getEObjectLabelProviderConfiguration_DisplayLabel();

+		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();

 	}

 

 }

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java
index c94da089b1e..651291bac86 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java
@@ -33,7 +33,7 @@ public class RowDisplayLabeTextHandler extends AbstractRowChangeLabelConfigurati
 	 */

 	@Override

 	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getEObjectLabelProviderConfiguration_DisplayLabel();

+		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayLabel();

 	}

 

 }

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java
index 46c6db0ba0b..ee8a66d8c20 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java
@@ -32,7 +32,7 @@ public class RowDisplayLabelImageHandler extends AbstractRowChangeLabelConfigura
 	 */

 	@Override

 	protected EStructuralFeature getEditedFeature() {

-		return NattablelabelproviderPackage.eINSTANCE.getEObjectLabelProviderConfiguration_DisplayIcon();

+		return NattablelabelproviderPackage.eINSTANCE.getObjectLabelProviderConfiguration_DisplayIcon();

 	}

 

 }

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java
index 34325ef40bb..6f79499989a 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java
@@ -38,7 +38,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.IAxis;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

 import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

 import org.eclipse.papyrus.infra.nattable.utils.Constants;

 import org.eclipse.papyrus.infra.nattable.utils.LabelProviderContextElement;

@@ -300,13 +300,13 @@ public abstract class AbstractAxisManager implements IAxisManager {
 	}

 

 

-	protected boolean hasAxisConfiguration(final TableEditorConfiguration configuration) {

+	protected boolean hasAxisConfiguration(final TableConfiguration configuration) {

 		AbstractAxisProvider axisConfig = null;

 		// we are working with the horizontal content provider

-		if(getTable().getHorizontalAxisProvider() == getRepresentedContentProvider()) {

-			axisConfig = configuration.getHorizontalAxisProvider();

+		if(getTable().getRowAxisProvider() == getRepresentedContentProvider()) {

+			axisConfig = configuration.getRowAxisProvider();

 		} else {// we are working with the

-			axisConfig = configuration.getVerticalAxisProvider();

+			axisConfig = configuration.getColumnAxisProvider();

 		}

 		if(axisConfig != null) {

 			return !axisConfig.getAxis().isEmpty();

@@ -315,7 +315,7 @@ public abstract class AbstractAxisManager implements IAxisManager {
 	}

 

 	protected boolean hasConfiguration() {

-		final TableEditorConfiguration configuration = getTable().getEditorConfiguration();

+		final TableConfiguration configuration = getTable().getEditorConfiguration();

 		return hasAxisConfiguration(configuration);

 	}

 

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
index 3af80627696..a7f5221a037 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
@@ -324,7 +324,7 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
 						if(start >= 0 && start < end) {

 							end--;

 						}

-						final List<IAxis> allAxis = AbstractNattableWidgetManager.this.table.getVerticalAxisProvider().getAxis();

+						final List<IAxis> allAxis = AbstractNattableWidgetManager.this.table.getColumnAxisProvider().getAxis();

 						final IAxis axisToMove = allAxis.get(start);

 						if(axisToMove != null) {

 							reorderColumnsElements(axisToMove, end);

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
index 425bf0c216a..6750f61de06 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
@@ -56,9 +56,9 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfigurati
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.DefaultAxisConfiguration;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration;

 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.ObjectLabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

 import org.eclipse.papyrus.infra.nattable.utils.StringComparator;

 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

@@ -124,8 +124,8 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
 	public NattableModelManager(final Table rawModel) {

 		super(rawModel);

 		// this.table = rawModel;

-		this.rowProvider = rawModel.getHorizontalAxisProvider();

-		this.columnProvider = rawModel.getVerticalAxisProvider();

+		this.rowProvider = rawModel.getRowAxisProvider();

+		this.columnProvider = rawModel.getColumnAxisProvider();

 		this.verticalElements = new ArrayList<Object>();

 		this.horizontalElements = new ArrayList<Object>();

 

@@ -274,8 +274,8 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
 			//update the label header configuration

 			final ILabelConfiguration columnLabelConfiguration = verticalAxisConfiguration.getLabelConfiguration();

 			final ILabelConfiguration rowLabelConfiguration = horizontalAxisConfiguration.getLabelConfiguration();

-			if(columnLabelConfiguration instanceof EObjectLabelProviderConfiguration) {

-				final EObjectLabelProviderConfiguration labelConfig = (EObjectLabelProviderConfiguration)columnLabelConfiguration;

+			if(columnLabelConfiguration instanceof ObjectLabelProviderConfiguration) {

+				final ObjectLabelProviderConfiguration labelConfig = (ObjectLabelProviderConfiguration)columnLabelConfiguration;

 				org.eclipse.core.commands.Command command = commandService.getCommand(CommandIds.COMMAND_COLUMN_LABEL_DISPLAY_ICON);

 				if(command != null) {

 					final State state = command.getState(CommandIds.TOGGLE_STATE);

@@ -325,8 +325,8 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
 				}

 			}

 

-			if(rowLabelConfiguration instanceof EObjectLabelProviderConfiguration) {

-				final EObjectLabelProviderConfiguration labelConfig = (EObjectLabelProviderConfiguration)rowLabelConfiguration;

+			if(rowLabelConfiguration instanceof ObjectLabelProviderConfiguration) {

+				final ObjectLabelProviderConfiguration labelConfig = (ObjectLabelProviderConfiguration)rowLabelConfiguration;

 				org.eclipse.core.commands.Command command = commandService.getCommand(CommandIds.COMMAND_ROW_LABEL_DISPLAY_ICON);

 				if(command != null) {

 					final State state = command.getState(CommandIds.TOGGLE_STATE);

@@ -408,11 +408,11 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
 	protected void init() {

 		final List<String> verticalContentProviderIds = getVerticalContentProviderIds();

 		assert !verticalContentProviderIds.isEmpty();

-		this.columnManager = createAxisManager(verticalContentProviderIds, this.table.getVerticalAxisProvider());

+		this.columnManager = createAxisManager(verticalContentProviderIds, this.table.getColumnAxisProvider());

 

 		final List<String> horizontalContentProviderIds = getHorizontalContentProviderIds();

 		assert !horizontalContentProviderIds.isEmpty();

-		this.rowManager = createAxisManager(horizontalContentProviderIds, this.table.getHorizontalAxisProvider());

+		this.rowManager = createAxisManager(horizontalContentProviderIds, this.table.getRowAxisProvider());

 	}

 

 	/**

@@ -448,7 +448,7 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
 	 *         axis

 	 */

 	protected List<String> getVerticalContentProviderIds() {

-		return this.table.getVerticalAxisProvider().getJavaAxisManagerIds();

+		return this.table.getColumnAxisProvider().getJavaAxisManagerIds();

 	}

 

 	/**

@@ -457,7 +457,7 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
 	 *         axis

 	 */

 	protected List<String> getHorizontalContentProviderIds() {

-		return this.table.getHorizontalAxisProvider().getJavaAxisManagerIds();

+		return this.table.getRowAxisProvider().getJavaAxisManagerIds();

 	}

 

 	/**

@@ -890,9 +890,9 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
 	 */

 	public AbstractAxisProvider getVerticalAxisProvider() {

 		if(this.table.isInvertAxis()) {

-			return this.table.getHorizontalAxisProvider();

+			return this.table.getRowAxisProvider();

 		} else {

-			return this.table.getVerticalAxisProvider();

+			return this.table.getColumnAxisProvider();

 		}

 	}

 

@@ -904,9 +904,9 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
 	 */

 	public AbstractAxisProvider getHorizontalAxisProvider() {

 		if(this.table.isInvertAxis()) {

-			return this.table.getVerticalAxisProvider();

+			return this.table.getColumnAxisProvider();

 		} else {

-			return this.table.getHorizontalAxisProvider();

+			return this.table.getRowAxisProvider();

 		}

 	}

 

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableHelper.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableHelper.java
index 0b170c4a6f0..6f9e20848cb 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableHelper.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableHelper.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;

 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableEditorConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

 

 /**

  * 

@@ -38,7 +38,7 @@ public class TableHelper {
 	 * @return

 	 *         the table created from this configuration

 	 */

-	public static final Table createTable(final TableEditorConfiguration configuration) {

+	public static final Table createTable(final TableConfiguration configuration) {

 		return createTable(configuration, null);

 	}

 

@@ -51,7 +51,7 @@ public class TableHelper {
 	 * @return

 	 *         the table created from these parameters

 	 */

-	public static final Table createTable(final TableEditorConfiguration configuration, final EObject context) {

+	public static final Table createTable(final TableConfiguration configuration, final EObject context) {

 		return createTable(configuration, null, null);

 	}

 

@@ -66,7 +66,7 @@ public class TableHelper {
 	 * @return

 	 *         the table created from these parameters

 	 */

-	public static final Table createTable(final TableEditorConfiguration configuration, final EObject context, final String name) {

+	public static final Table createTable(final TableConfiguration configuration, final EObject context, final String name) {

 		return createTable(configuration, null, null, null);

 	}

 

@@ -83,7 +83,7 @@ public class TableHelper {
 	 * @return

 	 *         the table created from these parameters

 	 */

-	public static final Table createTable(final TableEditorConfiguration configuration, final EObject context, final String name, final String description) {

+	public static final Table createTable(final TableConfiguration configuration, final EObject context, final String name, final String description) {

 		assert configuration != null;

 

 		Table table = NattableFactory.eINSTANCE.createTable();

@@ -93,14 +93,14 @@ public class TableHelper {
 		table.setContext(context);

 

 		//the configuration always provides axis provider

-		AbstractAxisProvider rowProvider = configuration.getHorizontalAxisProvider();

+		AbstractAxisProvider rowProvider = configuration.getRowAxisProvider();

 		rowProvider = EcoreUtil.copy(rowProvider);

 

-		AbstractAxisProvider columnProvider = configuration.getVerticalAxisProvider();

+		AbstractAxisProvider columnProvider = configuration.getColumnAxisProvider();

 		columnProvider = EcoreUtil.copy(columnProvider);

 

-		table.setHorizontalAxisProvider(rowProvider);

-		table.setVerticalAxisProvider(columnProvider);

+		table.setRowAxisProvider(rowProvider);

+		table.setColumnAxisProvider(columnProvider);

 		return table;

 

 	}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/resources/requirement.nattableconfiguration b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/resources/requirement.nattableconfiguration
index de49ef904a6..5fa74ba0133 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/resources/requirement.nattableconfiguration
+++ b/sandbox/TableV3/org.eclipse.papyrus.sysml.nattable.requirement/resources/requirement.nattableconfiguration
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<nattableconfiguration:TableEditorConfiguration 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:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" type="PapyrusSysMLRequirementNattable">

-  <verticalAxisProvider xsi:type="nattableaxisprovider:DefaultAxisProvider">

+<nattableconfiguration:TableConfiguration 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:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" type="PapyrusSysMLRequirementNattable">

+  <columnAxisProvider xsi:type="nattableaxisprovider:DefaultAxisProvider">

     <javaAxisManagerIds>org.eclipse.papyrus.uml.nattable.feature.axis.manager</javaAxisManagerIds>

     <javaAxisManagerIds>org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager</javaAxisManagerIds>

     <axisConfiguration xsi:type="nattableaxisconfiguration:DefaultAxisConfiguration" indexStyle="ALPHABETIC">

@@ -11,13 +11,13 @@
       <element href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

     </axis>

     <axis xsi:type="nattable:IdAxis" xmi:id="_WzxQiJIpEeK6zPuVxQg2UA" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>

-  </verticalAxisProvider>

-  <horizontalAxisProvider xsi:type="nattableaxisprovider:EMFFeatureValueAxisProvider" pastedElementTypeId="org.eclipse.papyrus.sysml.Requirement">

+  </columnAxisProvider>

+  <rowAxisProvider xsi:type="nattableaxisprovider:EMFFeatureValueAxisProvider" pastedElementTypeId="org.eclipse.papyrus.sysml.Requirement">

     <javaAxisManagerIds>org.eclipse.papyrus.sysml.nattable.requirement.axis.manager</javaAxisManagerIds>

     <axisConfiguration xsi:type="nattableaxisconfiguration:DefaultAxisConfiguration">

-      <labelConfiguration xsi:type="nattablelabelprovider:EObjectLabelProviderConfiguration" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider"/>

+      <labelConfiguration xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider"/>

     </axisConfiguration>

     <pastedElementContainmentFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>

     <listenFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>

-  </horizontalAxisProvider>

-</nattableconfiguration:TableEditorConfiguration>

+  </rowAxisProvider>

+</nattableconfiguration:TableConfiguration>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/resources/generic.nattableconfiguration b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/resources/generic.nattableconfiguration
index cc0d88dff25..97fafcaae01 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/resources/generic.nattableconfiguration
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable.generic/resources/generic.nattableconfiguration
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<nattableconfiguration:TableEditorConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" type="PapyruGenericNattable">

-  <verticalAxisProvider xsi:type="nattableaxisprovider:DefaultAxisProvider">

+<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" type="PapyruGenericNattable">

+  <columnAxisProvider xsi:type="nattableaxisprovider:DefaultAxisProvider">

     <javaAxisManagerIds>org.eclipse.papyrus.uml.nattable.feature.axis.manager</javaAxisManagerIds>

     <javaAxisManagerIds>org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager</javaAxisManagerIds>

     <axisConfiguration xsi:type="nattableaxisconfiguration:DefaultAxisConfiguration" indexStyle="ALPHABETIC">

       <labelConfiguration xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider"/>

     </axisConfiguration>

-  </verticalAxisProvider>

-  <horizontalAxisProvider xsi:type="nattableaxisprovider:DefaultAxisProvider">

+  </columnAxisProvider>

+  <rowAxisProvider xsi:type="nattableaxisprovider:DefaultAxisProvider">

     <javaAxisManagerIds>org.eclipse.papyrus.uml.nattable.element.axis.manager</javaAxisManagerIds>

     <axisConfiguration xsi:type="nattableaxisconfiguration:DefaultAxisConfiguration">

-      <labelConfiguration xsi:type="nattablelabelprovider:EObjectLabelProviderConfiguration" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider"/>

+      <labelConfiguration xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider"/>

     </axisConfiguration>

-  </horizontalAxisProvider>

-</nattableconfiguration:TableEditorConfiguration>

+  </rowAxisProvider>

+</nattableconfiguration:TableConfiguration>

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java
index 376956b20b9..39e1fdc8172 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java
@@ -21,9 +21,9 @@ import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
 import org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider;

 import org.eclipse.papyrus.infra.emf.nattable.registry.EStructuralFeatureImageRegistry;

 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.EObjectLabelProviderConfiguration;

 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.ObjectLabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

 import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement;

 import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElement;

@@ -89,7 +89,7 @@ public class StereotypePropertyHeaderLabelProvider extends EMFFeatureHeaderLabel
 			}

 

 		}

-		if(conf instanceof EObjectLabelProviderConfiguration && !((EObjectLabelProviderConfiguration)conf).isDisplayLabel()) {

+		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayLabel()) {

 			return "";

 		}

 		final Object value = ((ILabelProviderContextElement)element).getObject();

@@ -128,7 +128,7 @@ public class StereotypePropertyHeaderLabelProvider extends EMFFeatureHeaderLabel
 			}

 

 		}

-		if(conf instanceof EObjectLabelProviderConfiguration && !((EObjectLabelProviderConfiguration)conf).isDisplayIcon()) {

+		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayIcon()) {

 			return null;

 		}

 

diff --git a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLStereotypeRestrictedPropertyContentProvider.java b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLStereotypeRestrictedPropertyContentProvider.java
index 9e4640cfb7b..9a4c07b651e 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLStereotypeRestrictedPropertyContentProvider.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLStereotypeRestrictedPropertyContentProvider.java
@@ -54,7 +54,7 @@ public class UMLStereotypeRestrictedPropertyContentProvider extends UMLStereotyp
 			Profile profile = (Profile)parentElement;

 			Set<Stereotype> restrictedStereotypes = new HashSet<Stereotype>();

 			if(this.isRestricted && !profile.getOwnedStereotypes().isEmpty()) {

-				AbstractAxisProvider horizontalAxisProvider = this.umlStereotypePropertyManager.getTable().getHorizontalAxisProvider();

+				AbstractAxisProvider horizontalAxisProvider = this.umlStereotypePropertyManager.getTable().getRowAxisProvider();

 				List<Object> elementsList = this.umlStereotypePropertyManager.getTableManager().getElementsList(horizontalAxisProvider);

 				for(Object object : elementsList) {

 					if(object instanceof Element) {