401764: [Table 2] The classes managing the table model and Nattable must be refactored

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

Correct a small name error in the table metamodel + fix the synchronized tables

7 files changed, 70 insertions, 70 deletions

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 4f263839bab..ab4c8f81c27 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
@@ -138,7 +138,7 @@
           eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

       <eStructuralFeatures xsi:type="ecore:EReference" name="headerLabelConfiguration"

           lowerBound="1" eType="#//nattablelabelprovider/ILabelProviderConfiguration"/>

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="specificAxisConfigurations"

           upperBound="-1" eType="#//nattableaxisconfiguration/IAxisConfiguration"/>

     </eClassifiers>

     <eClassifiers xsi:type="ecore:EClass" name="AxisManagerConfiguration">

@@ -146,7 +146,7 @@
           eType="#//nattablelabelprovider/ILabelProviderConfiguration"/>

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

           eType="#//nattableaxisconfiguration/AxisManagerRepresentation"/>

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

+      <eStructuralFeatures xsi:type="ecore:EReference" name="localSpecificConfigurations"

           upperBound="-1" eType="#//nattableaxisconfiguration/IAxisConfiguration"/>

     </eClassifiers>

     <eClassifiers xsi:type="ecore:EClass" name="TableHeaderAxisConfiguration" eSuperTypes="#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration">

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
index 940e356efa6..d785bc975ac 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.I
  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager <em>Axis Manager</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfiguration <em>Local Specific Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfigurations <em>Local Specific Configurations</em>}</li>

  * </ul>

  * </p>

  *

@@ -90,19 +90,19 @@ public interface AxisManagerConfiguration extends EObject {
 	void setAxisManager(AxisManagerRepresentation value);

 

 	/**

-	 * Returns the value of the '<em><b>Local Specific Configuration</b></em>' reference list.

+	 * Returns the value of the '<em><b>Local Specific Configurations</b></em>' reference list.

 	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.

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

 	 * <p>

-	 * If the meaning of the '<em>Local Specific Configuration</em>' reference list isn't clear,

+	 * If the meaning of the '<em>Local Specific Configurations</em>' reference list isn't clear,

 	 * there really should be more of a description here...

 	 * </p>

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

-	 * @return the value of the '<em>Local Specific Configuration</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration_LocalSpecificConfiguration()

+	 * @return the value of the '<em>Local Specific Configurations</em>' reference list.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration_LocalSpecificConfigurations()

 	 * @model

 	 * @generated

 	 */

-	EList<IAxisConfiguration> getLocalSpecificConfiguration();

+	EList<IAxisConfiguration> getLocalSpecificConfigurations();

 

 } // AxisManagerConfiguration

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
index 0d58c1a9e38..6009706f106 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.I
  *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId <em>Axis Manager Id</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext <em>Label Provider Context</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration <em>Header Label Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfiguration <em>Specific Axis Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfigurations <em>Specific Axis Configurations</em>}</li>

  * </ul>

  * </p>

  *

@@ -117,19 +117,19 @@ public interface AxisManagerRepresentation extends EObject {
 	void setHeaderLabelConfiguration(ILabelProviderConfiguration value);

 

 	/**

-	 * Returns the value of the '<em><b>Specific Axis Configuration</b></em>' reference list.

+	 * Returns the value of the '<em><b>Specific Axis Configurations</b></em>' reference list.

 	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.

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

 	 * <p>

-	 * If the meaning of the '<em>Specific Axis Configuration</em>' reference list isn't clear,

+	 * If the meaning of the '<em>Specific Axis Configurations</em>' reference list isn't clear,

 	 * there really should be more of a description here...

 	 * </p>

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

-	 * @return the value of the '<em>Specific Axis Configuration</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_SpecificAxisConfiguration()

+	 * @return the value of the '<em>Specific Axis Configurations</em>' reference list.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_SpecificAxisConfigurations()

 	 * @model

 	 * @generated

 	 */

-	EList<IAxisConfiguration> getSpecificAxisConfiguration();

+	EList<IAxisConfiguration> getSpecificAxisConfigurations();

 

 } // AxisManagerRepresentation

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 fce766b658d..d76c69a59fd 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
@@ -206,13 +206,13 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	int AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION = 2;

 

 	/**

-	 * The feature id for the '<em><b>Specific Axis Configuration</b></em>' reference list.

+	 * The feature id for the '<em><b>Specific Axis Configurations</b></em>' reference list.

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

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

 	 * @generated

 	 * @ordered

 	 */

-	int AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATION = 3;

+	int AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS = 3;

 

 	/**

 	 * The number of structural features of the '<em>Axis Manager Representation</em>' class.

@@ -261,13 +261,13 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	int AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER = 1;

 

 	/**

-	 * The feature id for the '<em><b>Local Specific Configuration</b></em>' reference list.

+	 * The feature id for the '<em><b>Local Specific Configurations</b></em>' reference list.

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

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

 	 * @generated

 	 * @ordered

 	 */

-	int AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATION = 2;

+	int AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS = 2;

 

 	/**

 	 * The number of structural features of the '<em>Axis Manager Configuration</em>' class.

@@ -840,15 +840,15 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EReference getAxisManagerRepresentation_HeaderLabelConfiguration();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfiguration <em>Specific Axis Configuration</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfigurations <em>Specific Axis Configurations</em>}'.

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

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

-	 * @return the meta object for the reference list '<em>Specific Axis Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfiguration()

+	 * @return the meta object for the reference list '<em>Specific Axis Configurations</em>'.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getSpecificAxisConfigurations()

 	 * @see #getAxisManagerRepresentation()

 	 * @generated

 	 */

-	EReference getAxisManagerRepresentation_SpecificAxisConfiguration();

+	EReference getAxisManagerRepresentation_SpecificAxisConfigurations();

 

 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration <em>Axis Manager Configuration</em>}'.

@@ -883,15 +883,15 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 	EReference getAxisManagerConfiguration_AxisManager();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfiguration <em>Local Specific Configuration</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfigurations <em>Local Specific Configurations</em>}'.

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

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

-	 * @return the meta object for the reference list '<em>Local Specific Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfiguration()

+	 * @return the meta object for the reference list '<em>Local Specific Configurations</em>'.

+	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalSpecificConfigurations()

 	 * @see #getAxisManagerConfiguration()

 	 * @generated

 	 */

-	EReference getAxisManagerConfiguration_LocalSpecificConfiguration();

+	EReference getAxisManagerConfiguration_LocalSpecificConfigurations();

 

 	/**

 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration <em>Table Header Axis Configuration</em>}'.

@@ -1165,12 +1165,12 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		EReference AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION = eINSTANCE.getAxisManagerRepresentation_HeaderLabelConfiguration();

 

 		/**

-		 * The meta object literal for the '<em><b>Specific Axis Configuration</b></em>' reference list feature.

+		 * The meta object literal for the '<em><b>Specific Axis Configurations</b></em>' reference list feature.

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

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

 		 * @generated

 		 */

-		EReference AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATION = eINSTANCE.getAxisManagerRepresentation_SpecificAxisConfiguration();

+		EReference AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS = eINSTANCE.getAxisManagerRepresentation_SpecificAxisConfigurations();

 

 		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl <em>Axis Manager Configuration</em>}' class.

@@ -1199,12 +1199,12 @@ public interface NattableaxisconfigurationPackage extends EPackage {
 		EReference AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER = eINSTANCE.getAxisManagerConfiguration_AxisManager();

 

 		/**

-		 * The meta object literal for the '<em><b>Local Specific Configuration</b></em>' reference list feature.

+		 * The meta object literal for the '<em><b>Local Specific Configurations</b></em>' reference list feature.

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

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

 		 * @generated

 		 */

-		EReference AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATION = eINSTANCE.getAxisManagerConfiguration_LocalSpecificConfiguration();

+		EReference AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS = eINSTANCE.getAxisManagerConfiguration_LocalSpecificConfigurations();

 

 		/**

 		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.TableHeaderAxisConfigurationImpl <em>Table Header Axis Configuration</em>}' class.

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
index 97f8375e29d..2b684d69b15 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
@@ -42,7 +42,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.I
  * <ul>

  *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getAxisManager <em>Axis Manager</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getLocalSpecificConfiguration <em>Local Specific Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerConfigurationImpl#getLocalSpecificConfigurations <em>Local Specific Configurations</em>}</li>

  * </ul>

  * </p>

  *

@@ -70,14 +70,14 @@ public class AxisManagerConfigurationImpl extends MinimalEObjectImpl.Container i
 	protected AxisManagerRepresentation axisManager;

 

 	/**

-	 * The cached value of the '{@link #getLocalSpecificConfiguration() <em>Local Specific Configuration</em>}' reference list.

+	 * The cached value of the '{@link #getLocalSpecificConfigurations() <em>Local Specific Configurations</em>}' reference list.

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

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

-	 * @see #getLocalSpecificConfiguration()

+	 * @see #getLocalSpecificConfigurations()

 	 * @generated

 	 * @ordered

 	 */

-	protected EList<IAxisConfiguration> localSpecificConfiguration;

+	protected EList<IAxisConfiguration> localSpecificConfigurations;

 

 	/**

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

@@ -179,11 +179,11 @@ public class AxisManagerConfigurationImpl extends MinimalEObjectImpl.Container i
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EList<IAxisConfiguration> getLocalSpecificConfiguration() {

-		if (localSpecificConfiguration == null) {

-			localSpecificConfiguration = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATION);

+	public EList<IAxisConfiguration> getLocalSpecificConfigurations() {

+		if (localSpecificConfigurations == null) {

+			localSpecificConfigurations = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS);

 		}

-		return localSpecificConfiguration;

+		return localSpecificConfigurations;

 	}

 

 	/**

@@ -200,8 +200,8 @@ public class AxisManagerConfigurationImpl extends MinimalEObjectImpl.Container i
 			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

 				if (resolve) return getAxisManager();

 				return basicGetAxisManager();

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATION:

-				return getLocalSpecificConfiguration();

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

+				return getLocalSpecificConfigurations();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -221,9 +221,9 @@ public class AxisManagerConfigurationImpl extends MinimalEObjectImpl.Container i
 			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

 				setAxisManager((AxisManagerRepresentation)newValue);

 				return;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATION:

-				getLocalSpecificConfiguration().clear();

-				getLocalSpecificConfiguration().addAll((Collection<? extends IAxisConfiguration>)newValue);

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

+				getLocalSpecificConfigurations().clear();

+				getLocalSpecificConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);

 				return;

 		}

 		super.eSet(featureID, newValue);

@@ -243,8 +243,8 @@ public class AxisManagerConfigurationImpl extends MinimalEObjectImpl.Container i
 			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

 				setAxisManager((AxisManagerRepresentation)null);

 				return;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATION:

-				getLocalSpecificConfiguration().clear();

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

+				getLocalSpecificConfigurations().clear();

 				return;

 		}

 		super.eUnset(featureID);

@@ -262,8 +262,8 @@ public class AxisManagerConfigurationImpl extends MinimalEObjectImpl.Container i
 				return localHeaderLabelConfiguration != null;

 			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER:

 				return axisManager != null;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATION:

-				return localSpecificConfiguration != null && !localSpecificConfiguration.isEmpty();

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS:

+				return localSpecificConfigurations != null && !localSpecificConfigurations.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

diff --git a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
index c217b691f8b..0ff932309ae 100644
--- a/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
+++ b/sandbox/TableV3/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
@@ -42,7 +42,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.I
  *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getAxisManagerId <em>Axis Manager Id</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getLabelProviderContext <em>Label Provider Context</em>}</li>

  *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getHeaderLabelConfiguration <em>Header Label Configuration</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getSpecificAxisConfiguration <em>Specific Axis Configuration</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.impl.AxisManagerRepresentationImpl#getSpecificAxisConfigurations <em>Specific Axis Configurations</em>}</li>

  * </ul>

  * </p>

  *

@@ -100,14 +100,14 @@ public class AxisManagerRepresentationImpl extends MinimalEObjectImpl.Container
 	protected ILabelProviderConfiguration headerLabelConfiguration;

 

 	/**

-	 * The cached value of the '{@link #getSpecificAxisConfiguration() <em>Specific Axis Configuration</em>}' reference list.

+	 * The cached value of the '{@link #getSpecificAxisConfigurations() <em>Specific Axis Configurations</em>}' reference list.

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

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

-	 * @see #getSpecificAxisConfiguration()

+	 * @see #getSpecificAxisConfigurations()

 	 * @generated

 	 * @ordered

 	 */

-	protected EList<IAxisConfiguration> specificAxisConfiguration;

+	protected EList<IAxisConfiguration> specificAxisConfigurations;

 

 	/**

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

@@ -213,11 +213,11 @@ public class AxisManagerRepresentationImpl extends MinimalEObjectImpl.Container
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EList<IAxisConfiguration> getSpecificAxisConfiguration() {

-		if (specificAxisConfiguration == null) {

-			specificAxisConfiguration = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATION);

+	public EList<IAxisConfiguration> getSpecificAxisConfigurations() {

+		if (specificAxisConfigurations == null) {

+			specificAxisConfigurations = new EObjectResolvingEList<IAxisConfiguration>(IAxisConfiguration.class, this, NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS);

 		}

-		return specificAxisConfiguration;

+		return specificAxisConfigurations;

 	}

 

 	/**

@@ -235,8 +235,8 @@ public class AxisManagerRepresentationImpl extends MinimalEObjectImpl.Container
 			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:

 				if (resolve) return getHeaderLabelConfiguration();

 				return basicGetHeaderLabelConfiguration();

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATION:

-				return getSpecificAxisConfiguration();

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:

+				return getSpecificAxisConfigurations();

 		}

 		return super.eGet(featureID, resolve, coreType);

 	}

@@ -259,9 +259,9 @@ public class AxisManagerRepresentationImpl extends MinimalEObjectImpl.Container
 			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:

 				setHeaderLabelConfiguration((ILabelProviderConfiguration)newValue);

 				return;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATION:

-				getSpecificAxisConfiguration().clear();

-				getSpecificAxisConfiguration().addAll((Collection<? extends IAxisConfiguration>)newValue);

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:

+				getSpecificAxisConfigurations().clear();

+				getSpecificAxisConfigurations().addAll((Collection<? extends IAxisConfiguration>)newValue);

 				return;

 		}

 		super.eSet(featureID, newValue);

@@ -284,8 +284,8 @@ public class AxisManagerRepresentationImpl extends MinimalEObjectImpl.Container
 			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:

 				setHeaderLabelConfiguration((ILabelProviderConfiguration)null);

 				return;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATION:

-				getSpecificAxisConfiguration().clear();

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:

+				getSpecificAxisConfigurations().clear();

 				return;

 		}

 		super.eUnset(featureID);

@@ -305,8 +305,8 @@ public class AxisManagerRepresentationImpl extends MinimalEObjectImpl.Container
 				return LABEL_PROVIDER_CONTEXT_EDEFAULT == null ? labelProviderContext != null : !LABEL_PROVIDER_CONTEXT_EDEFAULT.equals(labelProviderContext);

 			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION:

 				return headerLabelConfiguration != null;

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATION:

-				return specificAxisConfiguration != null && !specificAxisConfiguration.isEmpty();

+			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS:

+				return specificAxisConfigurations != null && !specificAxisConfigurations.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

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 fc1b89df987..ad2f849970a 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
@@ -339,7 +339,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EReference getAxisManagerRepresentation_SpecificAxisConfiguration() {

+	public EReference getAxisManagerRepresentation_SpecificAxisConfigurations() {

 		return (EReference)axisManagerRepresentationEClass.getEStructuralFeatures().get(3);

 	}

 

@@ -375,7 +375,7 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EReference getAxisManagerConfiguration_LocalSpecificConfiguration() {

+	public EReference getAxisManagerConfiguration_LocalSpecificConfigurations() {

 		return (EReference)axisManagerConfigurationEClass.getEStructuralFeatures().get(2);

 	}

 

@@ -554,12 +554,12 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 		createEAttribute(axisManagerRepresentationEClass, AXIS_MANAGER_REPRESENTATION__AXIS_MANAGER_ID);

 		createEAttribute(axisManagerRepresentationEClass, AXIS_MANAGER_REPRESENTATION__LABEL_PROVIDER_CONTEXT);

 		createEReference(axisManagerRepresentationEClass, AXIS_MANAGER_REPRESENTATION__HEADER_LABEL_CONFIGURATION);

-		createEReference(axisManagerRepresentationEClass, AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATION);

+		createEReference(axisManagerRepresentationEClass, AXIS_MANAGER_REPRESENTATION__SPECIFIC_AXIS_CONFIGURATIONS);

 

 		axisManagerConfigurationEClass = createEClass(AXIS_MANAGER_CONFIGURATION);

 		createEReference(axisManagerConfigurationEClass, AXIS_MANAGER_CONFIGURATION__LOCAL_HEADER_LABEL_CONFIGURATION);

 		createEReference(axisManagerConfigurationEClass, AXIS_MANAGER_CONFIGURATION__AXIS_MANAGER);

-		createEReference(axisManagerConfigurationEClass, AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATION);

+		createEReference(axisManagerConfigurationEClass, AXIS_MANAGER_CONFIGURATION__LOCAL_SPECIFIC_CONFIGURATIONS);

 

 		tableHeaderAxisConfigurationEClass = createEClass(TABLE_HEADER_AXIS_CONFIGURATION);

 		createEReference(tableHeaderAxisConfigurationEClass, TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS);

@@ -641,12 +641,12 @@ public class NattableaxisconfigurationPackageImpl extends EPackageImpl implement
 		initEAttribute(getAxisManagerRepresentation_AxisManagerId(), ecorePackage.getEString(), "axisManagerId", null, 1, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEAttribute(getAxisManagerRepresentation_LabelProviderContext(), theEcorePackage.getEString(), "labelProviderContext", null, 0, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEReference(getAxisManagerRepresentation_HeaderLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null, "headerLabelConfiguration", null, 1, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getAxisManagerRepresentation_SpecificAxisConfiguration(), this.getIAxisConfiguration(), null, "specificAxisConfiguration", null, 0, -1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+		initEReference(getAxisManagerRepresentation_SpecificAxisConfigurations(), this.getIAxisConfiguration(), null, "specificAxisConfigurations", null, 0, -1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 

 		initEClass(axisManagerConfigurationEClass, AxisManagerConfiguration.class, "AxisManagerConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getAxisManagerConfiguration_LocalHeaderLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null, "localHeaderLabelConfiguration", null, 0, 1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEReference(getAxisManagerConfiguration_AxisManager(), this.getAxisManagerRepresentation(), null, "axisManager", null, 1, 1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getAxisManagerConfiguration_LocalSpecificConfiguration(), this.getIAxisConfiguration(), null, "localSpecificConfiguration", null, 0, -1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+		initEReference(getAxisManagerConfiguration_LocalSpecificConfigurations(), this.getIAxisConfiguration(), null, "localSpecificConfigurations", null, 0, -1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 

 		initEClass(tableHeaderAxisConfigurationEClass, TableHeaderAxisConfiguration.class, "TableHeaderAxisConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getTableHeaderAxisConfiguration_AxisManagers(), this.getAxisManagerRepresentation(), null, "axisManagers", null, 1, -1, TableHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$