Bug 532101: [AFViewpoints] Make AF editor faster

Bug 532104: [AFViewpoints] Transform your Workspace reference to
platform
reference

- Simplified the AF model wizard by defaulting the root to be
Architecture Domain.
- Extended the Load Resource action in the AF editor to allow loading AF
models from the running platfom.
- Added a Resolve All action that can be used on any object in the
editor to quickly resolve related references. This can be used on a
loaded AF model (from workspace or running platform) to also load its
dependencies like elementtypeconfigurtion and palleteconfiguration
files.
- Made the architecture, elementtypesetconfigurtion,
nattableconfiguration, and paletteconfiguration resources extend of a
common base class that supports default load/save options. This base
class also makes the cross references persist using platform:/platform
URIs but upon load, they may  resolve to platform:/resource if the
resource is available in the workspace.
- Refactored uml.architecture, all the elementtypeconfiguration, all
palletteconfiguration, and all nattableconfiguration models by changing
their cross references to platform:/plugin URI format.
- Fixed PasteEObjectConfigurationItemProvider to make the containment
reference axisIdentifier show in the editor/property sheet as a
containment reference (was necessary to convert its cross references
properly)

Change-Id: I69b82f53670cbb81e9117ce82c61d7c898080c93
Signed-off-by: Maged Elaasar <melaasar@gmail.com>

32 files changed, 131 insertions, 50 deletions

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
index f895ce57fa0..959d02b6c92 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF
@@ -18,15 +18,15 @@ Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[6.0.0,7.0.0)
  org.eclipse.papyrus.infra.emf.nattable;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.nattable.representation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 5.0.0.qualifier
+Bundle-Version: 5.0.100.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.infra.nattable.common.Activator
 Bundle-ManifestVersion: 2
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
index 241bd509554..c500e45a4bc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.common.elementTypeSet" name="NattableCommon" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.common.elementTypeSet" name="NattableCommon" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.common.helper.advice.NatTableDuplicateEditHelperAdvice"/>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
index 242c707ef10..069831f699d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/pom.xml
@@ -8,6 +8,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.common</artifactId>
-	<version>5.0.0-SNAPSHOT</version>
+	<version>5.0.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
index 15ffff4aa3e..b248630ed61 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.emf.expressions.edit;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
@@ -24,7 +24,7 @@ Export-Package: org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.p
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.0.100.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin$Implementation
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_AxisGroup.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_AxisGroup.gif
new file mode 100644
index 00000000000..2cbcfe13f54
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_AxisGroup.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EObjectAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EObjectAxis.gif
new file mode 100644
index 00000000000..e3dc34a0f2d
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EObjectAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EObjectTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EObjectTreeItemAxis.gif
new file mode 100644
index 00000000000..160e6520f62
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EObjectTreeItemAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EOperationAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EOperationAxis.gif
new file mode 100644
index 00000000000..160cd1837f9
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EOperationAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EOperationTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EOperationTreeItemAxis.gif
new file mode 100644
index 00000000000..e3dc34a0f2d
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EOperationTreeItemAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EStructuralFeatureAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EStructuralFeatureAxis.gif
new file mode 100644
index 00000000000..64e652345ea
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EStructuralFeatureAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EStructuralFeatureTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EStructuralFeatureTreeItemAxis.gif
new file mode 100644
index 00000000000..91e3ddb5024
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_EStructuralFeatureTreeItemAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_FeatureIdAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_FeatureIdAxis.gif
new file mode 100644
index 00000000000..483684f7570
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_FeatureIdAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_FeatureIdTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_FeatureIdTreeItemAxis.gif
new file mode 100644
index 00000000000..991b86ac321
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_FeatureIdTreeItemAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_IdTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_IdTreeItemAxis.gif
new file mode 100644
index 00000000000..375192a18bd
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_IdTreeItemAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_ObjectIdAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_ObjectIdAxis.gif
new file mode 100644
index 00000000000..38cd8a017cb
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_ObjectIdAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_ObjectIdTreeItemAxis.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_ObjectIdTreeItemAxis.gif
new file mode 100644
index 00000000000..85a51d1b4a8
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreatePasteEObjectConfiguration_axisIdentifier_ObjectIdTreeItemAxis.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml
index 4f55dc5e2f8..27b750c8127 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/pom.xml
@@ -8,6 +8,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.model.edit</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>4.0.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/PasteEObjectConfigurationItemProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/PasteEObjectConfigurationItemProvider.java
index 04931b74cd2..e951bfba83c 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/PasteEObjectConfigurationItemProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/PasteEObjectConfigurationItemProvider.java
@@ -18,10 +18,12 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;
 
@@ -55,7 +57,6 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
 
 			addPastedElementIdPropertyDescriptor(object);
 			addPasteElementContainementFeaturePropertyDescriptor(object);
-			addAxisIdentifierPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -105,27 +106,35 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
 	}
 
 	/**
-	 * This adds a property descriptor for the Axis Identifier feature.
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void addAxisIdentifierPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_PasteEObjectConfiguration_axisIdentifier_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_PasteEObjectConfiguration_axisIdentifier_feature", "_UI_PasteEObjectConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER,
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER);
+		}
+		return childrenFeatures;
 	}
-	
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
 	/**
 	 * This returns PasteEObjectConfiguration.gif.
 	 * <!-- begin-user-doc -->
@@ -173,9 +182,11 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
 
 		switch (notification.getFeatureID(PasteEObjectConfiguration.class)) {
 			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__PASTED_ELEMENT_ID:
-			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
+			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -190,6 +201,66 @@ public class PasteEObjectConfigurationItemProvider extends IPasteConfigurationIt
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER,
+				 NattableaxisFactory.eINSTANCE.createIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER,
+				 NattableaxisFactory.eINSTANCE.createEObjectAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER,
+				 NattableaxisFactory.eINSTANCE.createEObjectTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER,
+				 NattableaxisFactory.eINSTANCE.createFeatureIdAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER,
+				 NattableaxisFactory.eINSTANCE.createFeatureIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER,
+				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER,
+				 NattableaxisFactory.eINSTANCE.createEOperationAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER,
+				 NattableaxisFactory.eINSTANCE.createEStructuralFeatureTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER,
+				 NattableaxisFactory.eINSTANCE.createEOperationTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER,
+				 NattableaxisFactory.eINSTANCE.createObjectIdAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER,
+				 NattableaxisFactory.eINSTANCE.createObjectIdTreeItemAxis()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(NattableaxisconfigurationPackage.Literals.PASTE_EOBJECT_CONFIGURATION__AXIS_IDENTIFIER,
+				 NattableaxisFactory.eINSTANCE.createAxisGroup()));
 	}
 
 }
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
index 5420e84d622..eb384fdbd56 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
@@ -6,9 +6,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.emf.expressions.edit;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)"
 Export-Package: org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation,
  org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation,
  org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation,
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
index 42f7bcead60..8de1bcdeeae 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.emf;bundle-version="[1.0.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.infra.nattable.model,
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.genmodel b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.genmodel
index 124fce0c915..aedadc5a549 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.genmodel
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.genmodel
@@ -146,7 +146,7 @@
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute nattable.ecore#//nattableaxisconfiguration/PasteEObjectConfiguration/pastedElementId"/>
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
             ecoreFeature="ecore:EReference nattable.ecore#//nattableaxisconfiguration/PasteEObjectConfiguration/pasteElementContainementFeature"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EReference nattable.ecore#//nattableaxisconfiguration/PasteEObjectConfiguration/axisIdentifier"/>
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nattable.ecore#//nattableaxisconfiguration/PasteEObjectConfiguration/axisIdentifier"/>
       </genClasses>
       <genClasses ecoreClass="nattable.ecore#//nattableaxisconfiguration/TreeFillingConfiguration">
         <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nattable.ecore#//nattableaxisconfiguration/TreeFillingConfiguration/axisUsedAsAxisProvider"/>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/GenericRelationshipMatrixCellEditorConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/GenericRelationshipMatrixCellEditorConfiguration.java
index 14ce4057e2e..e1d2285c563 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/GenericRelationshipMatrixCellEditorConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/GenericRelationshipMatrixCellEditorConfiguration.java
@@ -139,6 +139,7 @@ public interface GenericRelationshipMatrixCellEditorConfiguration extends IMatri
 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage#getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwnerStrategy()
 	 * @model default="DEFAULT" required="true"
 	 * @generated
+	 * @since 4.1
 	 */
 	MatrixRelationShipOwnerStrategy getRelationshipOwnerStrategy();
 
@@ -150,6 +151,7 @@ public interface GenericRelationshipMatrixCellEditorConfiguration extends IMatri
 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.MatrixRelationShipOwnerStrategy
 	 * @see #getRelationshipOwnerStrategy()
 	 * @generated
+	 * @since 4.1
 	 */
 	void setRelationshipOwnerStrategy(MatrixRelationShipOwnerStrategy value);
 
@@ -165,6 +167,7 @@ public interface GenericRelationshipMatrixCellEditorConfiguration extends IMatri
 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage#getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwner()
 	 * @model containment="true"
 	 * @generated
+	 * @since 4.1
 	 */
 	IWrapper getRelationshipOwner();
 
@@ -175,6 +178,7 @@ public interface GenericRelationshipMatrixCellEditorConfiguration extends IMatri
 	 * @param value the new value of the '<em>Relationship Owner</em>' containment reference.
 	 * @see #getRelationshipOwner()
 	 * @generated
+	 * @since 4.1
 	 */
 	void setRelationshipOwner(IWrapper value);
 
@@ -191,6 +195,7 @@ public interface GenericRelationshipMatrixCellEditorConfiguration extends IMatri
 	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage#getGenericRelationshipMatrixCellEditorConfiguration_RelationshipOwnerFeature()
 	 * @model containment="true"
 	 * @generated
+	 * @since 4.1
 	 */
 	IAxis getRelationshipOwnerFeature();
 
@@ -201,6 +206,7 @@ public interface GenericRelationshipMatrixCellEditorConfiguration extends IMatri
 	 * @param value the new value of the '<em>Relationship Owner Feature</em>' containment reference.
 	 * @see #getRelationshipOwnerFeature()
 	 * @generated
+	 * @since 4.1
 	 */
 	void setRelationshipOwnerFeature(IAxis value);
 
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/MatrixRelationShipOwnerStrategy.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/MatrixRelationShipOwnerStrategy.java
index 0e9dabd6047..453629c652a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/MatrixRelationShipOwnerStrategy.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/MatrixRelationShipOwnerStrategy.java
@@ -30,6 +30,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablecelleditor.NattablecelleditorPackage#getMatrixRelationShipOwnerStrategy()
  * @model
  * @generated
+ * @since 4.1
  */
 public enum MatrixRelationShipOwnerStrategy implements Enumerator {
 	/**
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/GenericRelationshipMatrixCellEditorConfigurationImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/GenericRelationshipMatrixCellEditorConfigurationImpl.java
index 37fead0c62d..8760e90f6f8 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/GenericRelationshipMatrixCellEditorConfigurationImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablecelleditor/impl/GenericRelationshipMatrixCellEditorConfigurationImpl.java
@@ -120,6 +120,7 @@ public class GenericRelationshipMatrixCellEditorConfigurationImpl extends Styled
 	 * @see #getRelationshipOwnerStrategy()
 	 * @generated
 	 * @ordered
+	 * @since 4.1
 	 */
 	protected static final MatrixRelationShipOwnerStrategy RELATIONSHIP_OWNER_STRATEGY_EDEFAULT = MatrixRelationShipOwnerStrategy.DEFAULT;
 
@@ -130,6 +131,7 @@ public class GenericRelationshipMatrixCellEditorConfigurationImpl extends Styled
 	 * @see #getRelationshipOwnerStrategy()
 	 * @generated
 	 * @ordered
+	 * @since 4.1
 	 */
 	protected MatrixRelationShipOwnerStrategy relationshipOwnerStrategy = RELATIONSHIP_OWNER_STRATEGY_EDEFAULT;
 
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src/org/eclipse/papyrus/internal/infra/nattable/model/resources/NattableConfigurationResource.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src/org/eclipse/papyrus/internal/infra/nattable/model/resources/NattableConfigurationResource.java
index 3ed76425953..325b8acacbd 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src/org/eclipse/papyrus/internal/infra/nattable/model/resources/NattableConfigurationResource.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src/org/eclipse/papyrus/internal/infra/nattable/model/resources/NattableConfigurationResource.java
@@ -14,13 +14,13 @@
 package org.eclipse.papyrus.internal.infra.nattable.model.resources;
 
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.emf.resources.AbstractEMFResource;
+import org.eclipse.papyrus.emf.resources.AbstractEMFResourceWithUUID;
 
 /**
  * @author Vincent LORENZO
  * @since 4.1
  */
-public class NattableConfigurationResource extends AbstractEMFResource {
+public class NattableConfigurationResource extends AbstractEMFResourceWithUUID {
 
 	/**
 	 * the extension of the table configuration file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
index 4bd6af87c50..c4122e43971 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.representation.edit;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.papyrus.infra.nattable.representation.provider.RepresentationEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -18,8 +18,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)",
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml
index e27e029afca..71cab7826bf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/pom.xml
@@ -7,6 +7,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable.representation.edit</artifactId>
-	<version>1.0.100-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF
index 587e2d25680..722e0482326 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)",
  org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)",
  org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)"
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
index 4e50d290484..57459ddee32 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
@@ -66,15 +66,15 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0
  org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 6.0.0.qualifier
+Bundle-Version: 6.0.100.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.infra.nattable.Activator
 Bundle-ManifestVersion: 2
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
index 9ae10dbca06..187b0fee388 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontents.elementTypeSet" name="TableContents" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.TableContentsAdviceHelper" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.helper.advice.TableContentsAdviceHelper"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontents.elementTypeSet" name="TableContents" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.common.helper.advice.TableContentsAdviceHelper" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.helper.advice.TableContentsAdviceHelper"/>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
index 1a7c0729eda..3744305ca5e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontext.elementTypeSet" name="TableContext" metamodelNsURI="http://www.eclipse.org/papyrus/nattable/model">
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableContextAdvice"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.infra.nattable.tablecontext.elementTypeSet" name="TableContext" metamodelNsURI="http://www.eclipse.org/papyrus/nattable/model">
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jxuLwPvzEeWw0r4E4rSXyw" description="" identifier="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.infra.nattable.advice.DeleteNatTableContextAdvice"/>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
index 248d95cb20b..ccb16d47e67 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
@@ -8,6 +8,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.nattable</artifactId>
-	<version>6.0.0-SNAPSHOT</version>
+	<version>6.0.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file